Merge pull request #118 from jumpserver/dev

Dev

proxy.conf.json

@@ -3,31 +3,11 @@
     "target": "http://127.0.0.1:8080",
     "secure": false
   },
-  "/luna/i18n": {
-    "target": "http://127.0.0.1:5001",
-    "secure": false
-  },
-  "/socket.io/": {
+  "/koko": {
     "target": "http://127.0.0.1:5000",
     "secure": false,
     "ws": true
   },
-  "/coco/": {
-    "target": "http://127.0.0.1:5000",
-    "secure:": false,
-    "ws": true
-  },
-  "/static": {
-    "target": "http://127.0.0.1:5000",
-    "secure:": false
-  },
-  "/rdp/socket.io/": {
-    "target": "http://localhost:9250",
-    "pathRewrite": {
-      "^/rdp": ""
-    },
-    "secure": false
-  },
   "/media/": {
     "target": "http://127.0.0.1:8080",
     "secure": false

src/app/elements/nav/nav.component.ts

@@ -41,7 +41,7 @@ export class ElementNavComponent implements OnInit {
   click(event) {
     switch (event) {
       case 'ConnectSFTP': {
-        window.open('/coco/elfinder/sftp/');
+        window.open('/koko/elfinder/sftp/');
         break;
       }
       case 'HideLeft': {

src/app/elements/sftp/sftp.component.ts

 import {Component, OnInit, Input, ElementRef, ViewChild} from '@angular/core';
-import {DataStore} from '@app/globals';
 import {DomSanitizer} from '@angular/platform-browser';
 
 @Component({
@@ -16,7 +15,7 @@ export class ElementSftpComponent implements OnInit {
   }
 
   ngOnInit() {
-    let _target = '/coco/elfinder/sftp/';
+    let _target = '/koko/elfinder/sftp/';
     if (this.host) {
       // _target += 'f5857eee-c114-4564-af8f-96329c400a8a' + '/';
       _target += this.host.id + '/';

src/app/globals.ts

@@ -8,7 +8,7 @@ import {DataStore as _DataStore, Browser as _Browser, Video as _Video, Monitor a
 const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws';
 const port = document.location.port ? ':' + document.location.port : '';
 const hostname = document.location.hostname;
-const wsURL = `${scheme}://${hostname}${port}/socket.io/`;
+const wsURL = `${scheme}://${hostname}${port}/koko/ws/`;
 export let TermWS = null;
 
 export const emitter = new(EventEmitter);