Skip to content

L
luna
Commit 8db91b37 authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: update

parent 47bb2da5
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 57 deletions
package-lock.json
View file @ 8db91b37
...@@ -724,6 +724,11 @@ ...@@ -724,6 +724,11 @@
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
"dev": true "dev": true
}, },
"async-limiter": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
},
"asynckit": { "asynckit": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
...@@ -2627,42 +2632,50 @@ ...@@ -2627,42 +2632,50 @@
} }
}, },
"engine.io-client": { "engine.io-client": {
"version": "3.1.1", "version": "3.1.4",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz",
"integrity": "sha1-QVqYUrrbFPoAj6PvHjFgjbZ2EyU=", "integrity": "sha1-T88TcLRxY70s6b4nM5ckMDUNTqE=",
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"component-inherit": "0.0.3", "component-inherit": "0.0.3",
"debug": "2.6.8", "debug": "2.6.9",
"engine.io-parser": "2.1.1", "engine.io-parser": "2.1.1",
"has-cors": "1.1.0", "has-cors": "1.1.0",
"indexof": "0.0.1", "indexof": "0.0.1",
"parsejson": "0.0.3",
"parseqs": "0.0.5", "parseqs": "0.0.5",
"parseuri": "0.0.5", "parseuri": "0.0.5",
"ws": "2.3.1", "ws": "3.3.2",
"xmlhttprequest-ssl": "1.5.3", "xmlhttprequest-ssl": "1.5.4",
"yeast": "0.1.2" "yeast": "0.1.2"
}, },
"dependencies": { "dependencies": {
"safe-buffer": { "debug": {
"version": "5.0.1", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
}, },
"ultron": { "ultron": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
"integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=" "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
}, },
"ws": { "ws": {
"version": "2.3.1", "version": "3.3.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
"integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
"requires": { "requires": {
"safe-buffer": "5.0.1", "async-limiter": "1.0.0",
"ultron": "1.1.0" "safe-buffer": "5.1.1",
"ultron": "1.1.1"
} }
},
"xmlhttprequest-ssl": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz",
"integrity": "sha1-BPVgkVcks4kIhxXMDteBPpZ3v1c="
} }
} }
}, },
...@@ -10666,6 +10679,7 @@ ...@@ -10666,6 +10679,7 @@
"version": "0.0.3", "version": "0.0.3",
"resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
"integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
"dev": true,
"requires": { "requires": {
"better-assert": "1.0.2" "better-assert": "1.0.2"
} }
...@@ -11805,30 +11819,6 @@ ...@@ -11805,30 +11819,6 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true "dev": true
}, },
"pty.js": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/pty.js/-/pty.js-0.3.1.tgz",
"integrity": "sha1-gfW+0zLW5eeraFaI0boDc0ENUbU=",
"dev": true,
"requires": {
"extend": "1.2.1",
"nan": "2.3.5"
},
"dependencies": {
"extend": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
"integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=",
"dev": true
},
"nan": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz",
"integrity": "sha1-gioNwmYpDOTNOhIoLKPn42Rmigg=",
"dev": true
}
}
},
"public-encrypt": { "public-encrypt": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
...@@ -12349,8 +12339,7 @@ ...@@ -12349,8 +12339,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
"dev": true
}, },
"sass-graph": { "sass-graph": {
"version": "2.2.4", "version": "2.2.4",
...@@ -12697,7 +12686,7 @@ ...@@ -12697,7 +12686,7 @@
"engine.io": "3.1.0", "engine.io": "3.1.0",
"object-assign": "4.1.1", "object-assign": "4.1.1",
"socket.io-adapter": "1.1.1", "socket.io-adapter": "1.1.1",
"socket.io-client": "2.0.3", "socket.io-client": "2.0.4",
"socket.io-parser": "3.1.2" "socket.io-parser": "3.1.2"
} }
}, },
...@@ -12707,16 +12696,16 @@ ...@@ -12707,16 +12696,16 @@
"integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=" "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
}, },
"socket.io-client": { "socket.io-client": {
"version": "2.0.3", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
"integrity": "sha1-bK9K/5+FsZ/ZG2zhPWmttWT4hzs=", "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
"requires": { "requires": {
"backo2": "1.0.2", "backo2": "1.0.2",
"base64-arraybuffer": "0.1.5", "base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0", "component-bind": "1.0.0",
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"debug": "2.6.8", "debug": "2.6.8",
"engine.io-client": "3.1.1", "engine.io-client": "3.1.4",
"has-cors": "1.1.0", "has-cors": "1.1.0",
"indexof": "0.0.1", "indexof": "0.0.1",
"object-component": "0.0.3", "object-component": "0.0.3",
...@@ -14661,7 +14650,8 @@ ...@@ -14661,7 +14650,8 @@
"xmlhttprequest-ssl": { "xmlhttprequest-ssl": {
"version": "1.5.3", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
"integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=" "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
"dev": true
}, },
"xtend": { "xtend": {
"version": "4.0.1", "version": "4.0.1",
......
package.json
View file @ 8db91b37
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
"peity": "^3.2.1", "peity": "^3.2.1",
"rxjs": "^5.4.2", "rxjs": "^5.4.2",
"socket.io": "^2.0.3", "socket.io": "^2.0.3",
"socket.io-client": "^2.0.4",
"ssh-keygen": "^0.4.1", "ssh-keygen": "^0.4.1",
"tether": "^1.4.0", "tether": "^1.4.0",
"xterm": "^2.9.2", "xterm": "^2.9.2",
...@@ -67,7 +68,6 @@ ...@@ -67,7 +68,6 @@
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"node-sass": "^4.7.2", "node-sass": "^4.7.2",
"protractor": "~5.1.2", "protractor": "~5.1.2",
"pty.js": "^0.3.1",
"ts-node": "~3.2.0", "ts-node": "~3.2.0",
"tslint": "~5.3.2", "tslint": "~5.3.2",
"typescript": "~2.3.3" "typescript": "~2.3.3"
......
proxy.conf.json
View file @ 8db91b37
{ {
"/api": { "/api": {
"target": "http://localhost:3000", "target": "http://localhost:5000",
"secure": false "secure": false
}, },
"/socket.io/": { "/socket.io/": {
"target": "http://127.0.0.1:3000", "target": "http://127.0.0.1:5000",
"secure": false "secure": false
}, },
"/rdp/socket.io/": { "/rdp/socket.io/": {
......
src/app/ControlPage/control/ssh/ssh.component.ts
View file @ 8db91b37
...@@ -110,7 +110,7 @@ export class SshComponent implements OnInit { ...@@ -110,7 +110,7 @@ export class SshComponent implements OnInit {
}); });
socket.on('disconnect', function () { socket.on('disconnect', function () {
this.TerminalDisconnect(id); this.TerminalDisconnect(NavList.List[id]);
// TermStore.term[id]["term"].destroy(); // TermStore.term[id]["term"].destroy();
// TermStore.term[id]["connected"] = false; // TermStore.term[id]["connected"] = false;
}); });
...@@ -122,10 +122,10 @@ export class SshComponent implements OnInit { ...@@ -122,10 +122,10 @@ export class SshComponent implements OnInit {
let cols = 80; let cols = 80;
if (Cookie.get('rows')) { if (Cookie.get('rows')) {
rows = parseInt(Cookie.get('rows')); rows = parseInt(Cookie.get('rows'), 10);
} }
if (Cookie.get('cols')) { if (Cookie.get('cols')) {
cols = parseInt(Cookie.get('cols')); cols = parseInt(Cookie.get('cols'), 10);
} }
if (col < 80) { if (col < 80) {
col = 80; col = 80;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment