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

完善支持多行指令

Browse Source
This commit is contained in:
dushixiang
2021-01-26 23:19:16 +08:00
parent 807d24ccd8
commit 4bacdf3dbe
9 changed files with 84 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/routes.go
View File

@ -104,8 +104,8 @@ func SetupRoutes() *echo.Echo {
{
sessions.POST("", SessionCreateEndpoint)
sessions.GET("/paging", SessionPagingEndpoint)
sessions.POST("/:id/content", SessionContentEndpoint)
sessions.POST("/:id/discontent", Admin(SessionDiscontentEndpoint))
sessions.POST("/:id/connect", SessionConnectEndpoint)
sessions.POST("/:id/disconnect", Admin(SessionDisconnectEndpoint))
sessions.POST("/:id/resize", SessionResizeEndpoint)
sessions.POST("/:id/upload", SessionUploadEndpoint)
sessions.GET("/:id/download", SessionDownloadEndpoint)

4
pkg/api/session.go
View File

@ -75,7 +75,7 @@ func SessionDeleteEndpoint(c echo.Context) error {
return Success(c, nil)
}
func SessionContentEndpoint(c echo.Context) error {
func SessionConnectEndpoint(c echo.Context) error {
sessionId := c.Param("id")
session := model.Session{}
@ -89,7 +89,7 @@ func SessionContentEndpoint(c echo.Context) error {
return Success(c, nil)
}
func SessionDiscontentEndpoint(c echo.Context) error {
func SessionDisconnectEndpoint(c echo.Context) error {
sessionIds := c.Param("id")
split := strings.Split(sessionIds, ",")

2
web/src/components/access/Access.js
View File

@ -167,7 +167,7 @@ class Access extends Component {
};
updateSessionStatus = async (sessionId) => {
let result = await request.post(`/sessions/${sessionId}/content`);
let result = await request.post(`/sessions/${sessionId}/connect`);
if (result.code !== 1) {
message.error(result.message);
}

7
web/src/components/access/Console.js
View File

@ -101,7 +101,10 @@ class Console extends Component {
if (command !== '') {
let webSocket = this.state.webSocket;
if (webSocket !== undefined && webSocket.readyState === WebSocket.OPEN) {
webSocket.send(JSON.stringify({type: 'data', content: command + String.fromCharCode(13)}));
webSocket.send(JSON.stringify({
type: 'data',
content: command + String.fromCharCode(13)
}));
}
}
executedCommand = true;
@ -142,7 +145,7 @@ class Console extends Component {
}
term.focus();
if(webSocket.readyState === WebSocket.OPEN){
if (webSocket.readyState === WebSocket.OPEN) {
webSocket.send(JSON.stringify({type: 'resize', content: JSON.stringify({height, width})}));
}
}

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

@ -1,9 +1,11 @@
import React, {Component} from 'react';
import {Card, Input, List, PageHeader} from "antd";
import {Card, Input, List, PageHeader, Spin} from "antd";
import Console from "../access/Console";
import {itemRender} from "../../utils/utils";
import Logout from "../user/Logout";
import './Command.css'
import request from "../../common/request";
import {message} from "antd/es";
const {Search} = Input;
const routes = [
@ -29,13 +31,31 @@ class BatchCommand extends Component {
webSockets: [],
assets: [],
active: undefined,
loading: true
}
componentDidMount() {
let params = new URLSearchParams(this.props.location.search);
let command = params.get('command');
let assets = JSON.parse(params.get('assets'));
let commandId = params.get('commandId');
this.init(commandId, assets)
}
init = async (commandId, assets) => {
let result = await request.get(`/commands/${commandId}`);
if (result['code'] !== 1) {
message.error(result['message'], 10);
this.setState({
loading: false
})
return;
}
let command = result['data']['content'];
this.setState({
loading: false,
command: command,
assets: assets
})
@ -66,6 +86,7 @@ class BatchCommand extends Component {
>
</PageHeader>
<Spin spinning={this.state.loading} tip='正在获取指令内容...'>
<div className="page-search">
<Search ref={this.commandRef} placeholder="请输入指令" onSearch={value => {
for (let i = 0; i < this.state.webSockets.length; i++) {
@ -110,6 +131,8 @@ class BatchCommand extends Component {
)}
/>
</div>
</Spin>
</>
);
}

4
web/src/components/command/Command.css
View File

@ -1,4 +1,4 @@
.command-active {
box-shadow: 0 0 0 2px #1890FF;
outline: 2px solid #1890FF;
box-shadow: 0 0 0 2px red;
outline: 2px solid red;
}

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

@ -73,7 +73,7 @@ class DynamicCommand extends Component {
assetsVisible: false,
assets: [],
checkedAssets: [],
command: '',
commandId: '',
model: null,
selectedRowKeys: [],
delBtnLoading: false,
@ -223,7 +223,7 @@ class DynamicCommand extends Component {
}
});
window.location.href = '#/batch-command?command=' + this.state.command + '&assets=' + JSON.stringify(cAssets);
window.location.href = '#/batch-command?commandId=' + this.state.commandId + '&assets=' + JSON.stringify(cAssets);
};
handleOk = async (formData) => {
@ -463,7 +463,7 @@ class DynamicCommand extends Component {
this.setState({
assetsVisible: true,
command: record.content
commandId: record['id']
});
let result = await request.get('/assets?protocol=ssh');

2
web/src/components/command/DynamicCommandModal.js
View File

@ -48,7 +48,7 @@ const DynamicCommandModal = ({title, visible, handleOk, handleCancel, confirmLoa
</Form.Item>
<Form.Item label="指令内容" name='content' rules={[{required: true, message: '请输入指令内容'}]}>
<TextArea autoSize={{minRows: 5, maxRows: 10}} placeholder="多行指令也会当做一行执行，请使用 && 或 其他方式进行连接"/>
<TextArea autoSize={{minRows: 5, maxRows: 10}} placeholder="一行一个指令"/>
</Form.Item>
</Form>

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

@ -297,7 +297,7 @@ class OnlineSession extends Component {
});
const dis = async (id) => {
const result = await request.post(`/sessions/${id}/discontent`);
const result = await request.post(`/sessions/${id}/disconnect`);
if (result.code === 1) {
notification['success']({
message: '提示',