publish

.angular-cli.json

@@ -34,7 +34,8 @@
         "../node_modules/jquery-sparkline/jquery.sparkline.js",
         "../node_modules/tether/dist/js/tether.min.js",
         "../node_modules/bootstrap/dist/js/bootstrap.min.js",
-        "../node_modules/xterm/dist/xterm.js",
+        "../node_modules/term.js/src/term.js",
+        "../node_modules/tty.js/static/tty.js",
         "../node_modules/layui-layer/dist/layer.js",
         "../node_modules/socket.io-client/dist/socket.io.js",
         "./assets/js/mstsc.js",

package.json

@@ -40,12 +40,15 @@
     "ng2-charts": "^1.5.0",
     "ng2-cookies": "^1.0.12",
     "ngx-bootstrap": "^1.6.6",
-    "npm": "^5.5.1",
+    "npm": "^5.6.0",
     "peity": "^3.2.1",
+    "roboto-fontface": "^0.8.0",
     "rxjs": "^5.4.2",
     "socket.io": "^2.0.3",
+    "socket.io-client": "^2.0.4",
     "ssh-keygen": "^0.4.1",
     "tether": "^1.4.0",
+    "tty.js": "^0.2.15",
     "xterm": "^2.9.2",
     "zone.js": "^0.8.14"
   },
@@ -67,7 +70,6 @@
     "karma-jasmine-html-reporter": "^0.2.2",
     "node-sass": "^4.7.2",
     "protractor": "~5.1.2",
-    "pty.js": "^0.3.1",
     "ts-node": "~3.2.0",
     "tslint": "~5.3.2",
     "typescript": "~2.3.3"

proxy.conf.json

 {
   "/api": {
-    "target": "http://localhost:3000",
+    "target": "http://localhost:5000",
     "secure": false
   },
   "/socket.io/": {
-    "target": "http://127.0.0.1:3000",
+    "target": "http://127.0.0.1:5000",
     "secure": false
   },
   "/rdp/socket.io/": {

src/app/ControlPage/cleftbar/cleftbar.component.html

@@ -9,8 +9,8 @@
       <input type="checkbox" id="hostgroup-{{i}}">
       <label for="hostgroup-{{i}}">{{hostGroup.name}}</label>
       <ul>
-        <li *ngFor="let host of hostGroup.assets | SearchFilter: q" (click)="Connect(host)">
-          <i class="fa" [ngClass]="'fa-'+host.system" id="rdp-{{i}}"></i>
+        <li *ngFor="let host of hostGroup.assets_granted | SearchFilter: q" (click)="Connect(host)">
+          <i class="fa" [ngClass]="'fa-'+host.system" id="fa-{{i}}"></i>
           {{host.hostname}}
         </li>
       </ul>

src/app/ControlPage/cleftbar/cleftbar.component.ts

@@ -20,13 +20,13 @@ declare let jQuery: any;
 
 export class HostGroup {
   name: string;
-  id: number;
+  id: string;
   children: Array<Host>;
 }
 
 export class Host {
   name: string;
-  uuid: string;
+  id: string;
   type: string;
 }
 
@@ -95,9 +95,9 @@ export class CleftbarComponent implements OnInit {
   Connect(host) {
     console.log(host);
     let username: string;
-    if (host.system_users.length > 1) {
+    if (host.system_users_granted.length > 1) {
       let options = '';
-      for (let u of host.system_users) {
+      for (let u of host.system_users_granted) {
         options += '<option value="' + u.username + '">' + u.username + '</option>';
       }
       layer.open({
@@ -118,12 +118,15 @@ export class CleftbarComponent implements OnInit {
           // return false 开启该代码可禁止点击该按钮关闭
         }
       });
-    } else if (host.system_users.length === 1) {
-      username = host.system_users[0].username;
+    } else if (host.system_users_granted.length === 1) {
+      username = host.system_users_granted[0].username;
     }
     if (username === '') {
       return;
     }
+      jQuery('app-ssh').show();
+      jQuery('app-rdp').hide();
+      this._term.TerminalConnect(host, username);
     if (host.system === 'linux') {
       jQuery('app-ssh').show();
       jQuery('app-rdp').hide();

src/app/ControlPage/control/ssh/ssh.component.ts

@@ -49,6 +49,7 @@ export class SshComponent implements OnInit {
   }
 
   TerminalConnect(host, username) {
+  console.log(host,username);
     const socket = io.connect('/ssh');
     let cols = '80';
     let rows = '24';
@@ -69,7 +70,7 @@ export class SshComponent implements OnInit {
     NavList.List[id].closed = false;
     NavList.List[id].type = 'ssh';
     NavList.List[id].Term = new Term;
-    NavList.List[id].Term.machine = host.uuid;
+    NavList.List[id].Term.machine = host.id;
     NavList.List[id].Term.socket = socket;
     NavList.List[id].Term.term = new Terminal({
       cols: cols,
@@ -98,7 +99,7 @@ export class SshComponent implements OnInit {
     NavList.List[id].Term.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');
 
     socket.on('connect', function () {
-      socket.emit('host', {'uuid': host.uuid, 'user': username});
+      socket.emit('host', {'uuid': host.id, 'user': username});
 
       NavList.List[id].Term.term.on('data', function (data) {
         socket.emit('data', data);
@@ -110,7 +111,7 @@ export class SshComponent implements OnInit {
       });
 
       socket.on('disconnect', function () {
-        this.TerminalDisconnect(id);
+        this.TerminalDisconnect(NavList.List[id]);
         // TermStore.term[id]["term"].destroy();
         // TermStore.term[id]["connected"] = false;
       });
@@ -122,10 +123,10 @@ export class SshComponent implements OnInit {
         let cols = 80;
 
         if (Cookie.get('rows')) {
-          rows = parseInt(Cookie.get('rows'));
+          rows = parseInt(Cookie.get('rows'), 10);
         }
         if (Cookie.get('cols')) {
-          cols = parseInt(Cookie.get('cols'));
+          cols = parseInt(Cookie.get('cols'), 10);
         }
         if (col < 80) {
           col = 80;

src/app/app.service.ts

@@ -18,14 +18,14 @@ declare let jQuery: any;
 import * as io from 'socket.io-client';
 
 export class Group {
-  id: number;
+  id: string;
   name: string;
   membercount: number;
   comment: string;
 }
 
 export let User: {
-  id: number;
+  id: string;
   name: string;
   username: string;
   password: string;
@@ -39,7 +39,7 @@ export let User: {
   groups: Array<Group>;
   logined: boolean;
 } = {
-  id: 0,
+  id: '',
   name: 'nobody',
   username: '',
   password: '',

src/styles.css

@@ -30,7 +30,9 @@ app-root {
   padding-bottom: 16px !important;
   font-family: 'Monaco', iosevka !important;
 }
-
+.terminal{
+   white-space: nowrap;
+}
 .terminal, .terminal .xterm-viewport {
   background-color: inherit;
 }