From f2ac06aea62270fc53b0626ac6d91788cf5189a2 Mon Sep 17 00:00:00 2001
From: "Frank.R.Wu" <wukd94@pku.edu.cn>
Date: Wed, 16 Jun 2021 23:42:23 +0800
Subject: [PATCH] fix

---
 BaaSOnlineIDE.html        | 1 +
 js/OnlineIDE.js           | 4 ++--
 js/commonutil.js          | 3 +--
 js/onlineide/rightmenu.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BaaSOnlineIDE.html b/BaaSOnlineIDE.html
index bc9ed15..641c2f3 100644
--- a/BaaSOnlineIDE.html
+++ b/BaaSOnlineIDE.html
@@ -704,6 +704,7 @@
 
 
 <script>
+    const isBaaS = true
     var h = document.body.clientHeight
         - $("header").css("height").replace("px", "")
         - $("footer").css("height").replace("px", "");
diff --git a/js/OnlineIDE.js b/js/OnlineIDE.js
index e748bf1..d3a40c7 100644
--- a/js/OnlineIDE.js
+++ b/js/OnlineIDE.js
@@ -138,7 +138,7 @@ function getControlWsUrl(host) {
 function initWSocket() {
     console.log("[nodecenterManagement.js] initWSocket : ");
     let host = document.location.host;
-    let url = getControlWsUrl(host);
+    let url = getControlWsUrl(global.urlparam && global.urlparam.nodeAddr ? global.urlparam.nodeAddr : host);
     // console.log("connect ws:" + url);
     global.wssocket = createWssocket(url, function () {
         getSession();
@@ -478,7 +478,7 @@ function init() {
 }
 
 function getRequestParameters() {
-    if (location.href.indexOf("/BaaSOnlineIDE.html") !== -1) {
+    if (isBaaS) {
         let params = location.href.replace(/[^#]*(#(\/)?|\?)/, '')
         let url = location.href.replace(params, '')
         while (!params) {
diff --git a/js/commonutil.js b/js/commonutil.js
index 06f94b6..c059fe3 100644
--- a/js/commonutil.js
+++ b/js/commonutil.js
@@ -203,8 +203,7 @@ function initVue() {
 function initGlobal(urlParams) {
     window.global = {};
     global.result = "";
-    if (location.href.indexOf("/BaaSOnlineIDE.html") !== -1) {
-        global.isBaaS = true
+    if (isBaaS) {
         primaryColor = "#08263a"
     }
     if (urlParams){
diff --git a/js/onlineide/rightmenu.js b/js/onlineide/rightmenu.js
index 843e51c..404a321 100644
--- a/js/onlineide/rightmenu.js
+++ b/js/onlineide/rightmenu.js
@@ -176,7 +176,7 @@ var importContractInstanceCodeByDOI = function () {
 
 var openinClient = function () {
     let url
-    if (global.isBaaS) {
+    if (isBaaS) {
         url = `${location.origin}/client/BaaSClient.html${location.search}`;
     } else {
         url = `${location.origin}/client/bdwareclient.html?self=true&contract=${mainVue.contracts[selectedContract.value].id}`