修改前端样式

web/src/components/user/Info.js

@@ -3,7 +3,7 @@ import {Button, Card, Form, Image, Input, Layout, Modal, PageHeader, Result, Spa
 import {itemRender} from '../../utils/utils'
 import request from "../../common/request";
 import {message} from "antd/es";
-import Logout from "./Logout";
+import LayoutHeader from "./LayoutHeader";
 import {ExclamationCircleOutlined, ReloadOutlined} from "@ant-design/icons";
 
 const {Content} = Layout;
@@ -123,15 +123,13 @@ class Info extends Component {
         return (
             <>
                 <PageHeader
-                    className="site-page-header-ghost-wrapper page-herder"
+                    className="site-page-header-ghost-wrapper"
                     title="个人中心"
                     breadcrumb={{
                         routes: routes,
                         itemRender: itemRender
                     }}
-                    extra={[
-                        <Logout key='logout'/>
-                    ]}
+
                     subTitle="个人中心"
                 />
 

web/src/components/user/LayoutHeader.js

@@ -0,0 +1,87 @@
+import React, {Component} from 'react';
+import {Col, Dropdown, Menu, message, Popconfirm, Row, Tooltip} from "antd";
+import request from "../../common/request";
+import {getCurrentUser} from "../../service/permission";
+import {GithubOutlined, LogoutOutlined, QuestionCircleOutlined, SolutionOutlined} from "@ant-design/icons";
+import {Link} from "react-router-dom";
+
+class LayoutHeader extends Component {
+
+    confirm = async (e) => {
+        let result = await request.post('/logout');
+        if (result['code'] !== 1) {
+            message.error(result['message']);
+        } else {
+            message.success('退出登录成功，即将跳转至登录页面。');
+            window.location.reload();
+        }
+    }
+
+
+    render() {
+
+        const menu = (
+            <Menu>
+
+                <Menu.Item>
+                    <Link to={'/info'}>
+                        <SolutionOutlined/>
+                        个人中心
+                    </Link>
+                </Menu.Item>
+
+                <Menu.Item>
+                    <a target='_blank' href='https://github.com/dushixiang/next-terminal'>
+                        <GithubOutlined/>
+                        点个Star
+                    </a>
+                </Menu.Item>
+
+                <Menu.Divider/>
+
+                <Menu.Item>
+
+                    <Popconfirm
+                        key='login-btn-pop'
+                        title="您确定要退出登录吗?"
+                        onConfirm={this.confirm}
+                        okText="确定"
+                        cancelText="取消"
+                        placement="left"
+                    >
+                        <LogoutOutlined/>
+                        退出登录
+                    </Popconfirm>
+                </Menu.Item>
+
+            </Menu>
+        );
+
+        return (
+            <div className='layout-header'>
+                <Row justify="space-around" align="middle" gutter={24} style={{height: 48}}>
+                    <Col span={4} key={1} style={{height: 48}}> </Col>
+                    <Col span={20} key={2} style={{textAlign: 'right'}} className={'layout-header-right'}>
+
+                        <div className={'layout-header-right-item'}>
+                            <Tooltip placement="bottom" title={'使用帮助'}>
+                                <a target='_blank' href='https://github.com/dushixiang/next-terminal/blob/master/docs/faq.md'>
+                                    <QuestionCircleOutlined/>
+                                </a>
+                            </Tooltip>
+
+                        </div>
+
+
+                        <Dropdown overlay={menu}>
+                            <div className='nickname layout-header-right-item'>{getCurrentUser()['nickname']}</div>
+                        </Dropdown>
+                    </Col>
+                </Row>
+
+            </div>
+        );
+    }
+}
+
+export default LayoutHeader;

web/src/components/user/Logout.js

@@ -1,53 +0,0 @@
-import React, {Component} from 'react';
-import {Button, Dropdown, Menu, message, Popconfirm} from "antd";
-import request from "../../common/request";
-import {getCurrentUser} from "../../service/permission";
-
-class Logout extends Component {
-
-    confirm = async (e) => {
-        let result = await request.post('/logout');
-        if (result['code'] !== 1) {
-            message.error(result['message']);
-        } else {
-            message.success('退出登录成功，即将跳转至登录页面。');
-            window.location.reload();
-        }
-    }
-
-
-    render() {
-
-        const menu = (
-            <Menu>
-
-                <Menu.Item>
-
-                    <Popconfirm
-                        key='login-btn-pop'
-                        title="您确定要退出登录吗?"
-                        onConfirm={this.confirm}
-                        okText="确定"
-                        cancelText="取消"
-                        placement="left"
-                    >
-                        退出登录
-                    </Popconfirm>
-                </Menu.Item>
-
-            </Menu>
-        );
-
-        return (
-            <div>
-                <Dropdown overlay={menu}>
-                    <Button key="login-btn" type="dashed">
-                        {getCurrentUser()['nickname']}
-                    </Button>
-                </Dropdown>
-            </div>
-        );
-    }
-}
-
-export default Logout;

web/src/components/user/User.js

@@ -25,16 +25,16 @@ import UserModal from "./UserModal";
 import request from "../../common/request";
 import {message} from "antd/es";
 import {
-    CheckCircleOutlined,
     DeleteOutlined,
     DownOutlined,
-    ExclamationCircleOutlined, InsuranceOutlined,
+    ExclamationCircleOutlined,
+    InsuranceOutlined,
     LockOutlined,
     PlusOutlined,
     SyncOutlined,
     UndoOutlined
 } from '@ant-design/icons';
-import Logout from "./Logout";
+import LayoutHeader from "./LayoutHeader";
 import UserShareAsset from "./UserShareAsset";
 import {hasPermission} from "../../service/permission";
 import dayjs from "dayjs";
@@ -352,9 +352,9 @@ class User extends Component {
             render: (text, record) => {
 
                 if (text === '1') {
-                    return <Tag icon={<InsuranceOutlined />} color="success">开启</Tag>;
-                }else {
-                    return <Tag icon={<ExclamationCircleOutlined />} color="warning">关闭</Tag>;
+                    return <Tag icon={<InsuranceOutlined/>} color="success">开启</Tag>;
+                } else {
+                    return <Tag icon={<ExclamationCircleOutlined/>} color="warning">关闭</Tag>;
                 }
             }
         }, {
@@ -474,15 +474,13 @@ class User extends Component {
         return (
             <>
                 <PageHeader
-                    className="site-page-header-ghost-wrapper page-herder"
+                    className="site-page-header-ghost-wrapper"
                     title="用户管理"
                     breadcrumb={{
                         routes: routes,
                         itemRender: itemRender
                     }}
-                    extra={[
-                        <Logout key='logout'/>
-                    ]}
+
                     subTitle="平台用户管理"
                 >
                 </PageHeader>

web/src/components/user/UserGroup.js

@@ -6,7 +6,7 @@ import qs from "qs";
 import request from "../../common/request";
 import {message} from "antd/es";
 import {DeleteOutlined, ExclamationCircleOutlined, PlusOutlined, SyncOutlined, UndoOutlined} from '@ant-design/icons';
-import Logout from "./Logout";
+import LayoutHeader from "./LayoutHeader";
 import UserGroupModal from "./UserGroupModal";
 import UserShareAsset from "./UserShareAsset";
 import dayjs from "dayjs";
@@ -336,15 +336,13 @@ class UserGroup extends Component {
         return (
             <>
                 <PageHeader
-                    className="site-page-header-ghost-wrapper page-herder"
+                    className="site-page-header-ghost-wrapper"
                     title="用户组管理"
                     breadcrumb={{
                         routes: routes,
                         itemRender: itemRender
                     }}
-                    extra={[
-                        <Logout key='logout'/>
-                    ]}
+
                     subTitle="平台用户管理"
                 >
                 </PageHeader>