evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加从环境变量获取配置&修复修改密码失败的bug&增加退出登录&修复新增用户无法登录的bug

Browse Source
This commit is contained in:
dushixiang
2020-12-26 23:56:02 +08:00
parent 712e2cfe84
commit 31e18d0418
24 changed files with 195 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/common/constants.js
View File

@ -1,12 +1,12 @@
// prod
export const server = '';
export const wsServer = '';
export const prefix = '';
// export const server = '';
// export const wsServer = '';
// export const prefix = '';
// dev
// export const server = '//127.0.0.1:8088';
// export const wsServer = 'ws://127.0.0.1:8088';
// export const prefix = '';
export const server = '//127.0.0.1:8088';
export const wsServer = 'ws://127.0.0.1:8088';
export const prefix = '';
// export const server = '//172.16.101.32:8080';
// export const wsServer = 'ws://172.16.101.32:8080';

16
web/src/components/Login.js
View File

@ -12,9 +12,20 @@ const {Title} = Typography;
class LoginForm extends Component {
state = {
inLogin: false
inLogin: false,
height: window.innerHeight,
width: window.innerWidth
};
componentDidMount() {
window.addEventListener('resize', () => {
this.setState({
height: window.innerHeight,
width: window.innerWidth
})
});
}
handleSubmit = async params => {
this.setState({
inLogin: true
@ -50,7 +61,8 @@ class LoginForm extends Component {
render() {
return (
<div className='login-bg' style={{width: window.innerWidth, height: window.innerHeight, backgroundColor: '#F0F2F5'}}>
<div className='login-bg'
style={{width: this.state.width, height: this.state.height, backgroundColor: '#F0F2F5'}}>
<Card className='login-card' title={null}>
<div style={{textAlign: "center", margin: '15px auto 30px auto', color: '#1890ff'}}>
<Title level={1}>Next Terminal</Title>

4
web/src/components/asset/Asset.js
View File

@ -36,6 +36,7 @@ import {
} from '@ant-design/icons';
import {itemRender} from "../../utils/utils";
import {PROTOCOL_COLORS} from "../../common/constants";
import Logout from "../user/Logout";
const confirm = Modal.confirm;
const {Search} = Input;
@ -384,6 +385,9 @@ class Asset extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="资产"
>
</PageHeader>

4
web/src/components/command/BatchCommand.js
View File

@ -2,6 +2,7 @@ import React, {Component} from 'react';
import {List, Card, Input, PageHeader} from "antd";
import Console from "../access/Console";
import {itemRender} from "../../utils/utils";
import Logout from "../user/Logout";
const {Search} = Input;
const routes = [
{
@ -55,6 +56,9 @@ class BatchCommand extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="动态指令"
>
</PageHeader>

4
web/src/components/command/DynamicCommand.js
View File

@ -30,6 +30,7 @@ import {
UndoOutlined
} from '@ant-design/icons';
import {itemRender} from "../../utils/utils";
import Logout from "../user/Logout";
const confirm = Modal.confirm;
const {Content} = Layout;
@ -359,6 +360,9 @@ class DynamicCommand extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="批量动态指令执行"
>
</PageHeader>

4
web/src/components/credential/Credential.js
View File

@ -14,6 +14,7 @@ import {
UndoOutlined
} from '@ant-design/icons';
import {itemRender} from "../../utils/utils";
import Logout from "../user/Logout";
const confirm = Modal.confirm;
const {Search} = Input;
@ -280,6 +281,9 @@ class Credential extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="访问资产的账户、密钥等"
>
</PageHeader>

6
web/src/components/dashboard/Dashboard.js
View File

@ -1,11 +1,12 @@
import React, {Component} from 'react';
import {Card, Col, PageHeader, Radio, Row, Statistic} from "antd";
import {Button, Card, Col, PageHeader, Radio, Row, Statistic} from "antd";
import {DesktopOutlined, IdcardOutlined, LinkOutlined, UserOutlined} from '@ant-design/icons';
import {itemRender} from '../../utils/utils'
import request from "../../common/request";
import './Dashboard.css'
import {Link} from "react-router-dom";
import {Area} from '@ant-design/charts';
import Logout from "../user/Logout";
const routes = [
@ -86,6 +87,9 @@ class Dashboard extends Component {
itemRender: itemRender
}}
subTitle="仪表盘"
extra={[
<Logout/>
]}
>
</PageHeader>

4
web/src/components/session/OfflineSession.js
View File

@ -31,6 +31,7 @@ import {
UndoOutlined
} from "@ant-design/icons";
import {PROTOCOL_COLORS} from "../../common/constants";
import Logout from "../user/Logout";
const confirm = Modal.confirm;
const {Content} = Layout;
@ -357,6 +358,9 @@ class OfflineSession extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="离线会话管理"
>
</PageHeader>

4
web/src/components/session/OnlineSession.js
View File

@ -31,6 +31,7 @@ import {
UndoOutlined
} from "@ant-design/icons";
import Monitor from "../access/Monitor";
import Logout from "../user/Logout";
const confirm = Modal.confirm;
const {Content} = Layout;
@ -348,6 +349,9 @@ class OnlineSession extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="查询实时在线会话"
>
</PageHeader>

4
web/src/components/setting/Setting.js
View File

@ -3,6 +3,7 @@ import {Button, Form, Input, Layout, PageHeader, Select, Switch, Tabs, Typograph
import {itemRender} from '../../utils/utils'
import request from "../../common/request";
import {message} from "antd/es";
import Logout from "../user/Logout";
const {Content} = Layout;
const {Option} = Select;
@ -107,6 +108,9 @@ class Setting extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="系统设置"
>
</PageHeader>

7
web/src/components/user/Info.js
View File

@ -3,6 +3,7 @@ import {Button, Form, Input, Layout, PageHeader} from "antd";
import {itemRender} from '../../utils/utils'
import request from "../../common/request";
import {message} from "antd/es";
import Logout from "./Logout";
const {Content} = Layout;
@ -61,7 +62,8 @@ class Info extends Component {
changePassword = async (values) => {
let result = await request.post('/change-password', values);
if (result.code === 1) {
message.success('密码修改成功');
message.success('密码修改成功，即将跳转至登录页面');
window.location.href = '/#';
} else {
message.error(result.message);
}
@ -77,6 +79,9 @@ class Info extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="个人中心"
>
</PageHeader>

37
web/src/components/user/Logout.js Normal file
View File

@ -0,0 +1,37 @@
import React, {Component} from 'react';
import {Button, message, Popconfirm} from "antd";
import request from "../../common/request";
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() {
return (
<div>
<Popconfirm
title="您确定要退出登录吗?"
onConfirm={this.confirm}
okText="确定"
cancelText="取消"
placement="left"
>
<Button key="login-btn" type="dashed">
退出登录
</Button>,
</Popconfirm>
</div>
);
}
}
export default Logout;

4
web/src/components/user/User.js
View File

@ -28,6 +28,7 @@ import {
SyncOutlined,
UndoOutlined
} from '@ant-design/icons';
import Logout from "./Logout";
const confirm = Modal.confirm;
const {Search} = Input;
@ -308,6 +309,9 @@ class User extends Component {
routes: routes,
itemRender: itemRender
}}
extra={[
<Logout/>
]}
subTitle="平台用户管理"
>
</PageHeader>