From e96048de2a40127df13cfb9c4fff3290169aa750 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Tue, 26 Oct 2021 11:22:45 +0800 Subject: [PATCH] fix: path bug --- NodePortal_Gateway.html | 1333 +++++++++++++++++++++++++++++++++++ index_gate.html | 1333 +++++++++++++++++++++++++++++++++++ index_gateway.html | 165 +++++ js/NodeContractInstances.js | 2 +- js/NodePortal.js | 4 +- js/OnlineIDE.js | 10 +- js/cm.js | 4 +- js/nodeCenter.js | 4 +- 8 files changed, 2837 insertions(+), 18 deletions(-) create mode 100644 NodePortal_Gateway.html create mode 100644 index_gate.html create mode 100644 index_gateway.html diff --git a/NodePortal_Gateway.html b/NodePortal_Gateway.html new file mode 100644 index 0000000..ee36cb5 --- /dev/null +++ b/NodePortal_Gateway.html @@ -0,0 +1,1333 @@ + + + + + 数瑞数联网网关Portal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+
+
+
+
用户情况
+ +
+
+ Loading... +
+
+
+
+
+
+
+
+
用户活跃统计
+ +
+
+
+ Loading... +
+
+
+ +
+
+
+
+ + +
+
+
+
+
授权用户管理
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
未授权用户管理
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+ +
+ +
+
+ +
+
+
+
+
+
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ + + + + + +
+ + +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ + +
+
+
+
+
+
+ 返回结果显示 +

+ +
+
+
+
+ + +
+ +
+
+
+ + +
+ + +
+
+ +
+
+
+
+
DO实例状态
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
各类DO实例调用次数
+
+
+
+ Loading... +
+
+
+
+
+
+
+ +
+
+
+
+
DO实例列表
+
+
+ Loading... +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ Loading... +
+
+
+ +
+
+
+
+
+
+
+
实例详情
+
+
+
+ +
+ +
+ + + + + +
+
+
+
实例调用
+
+
+ +
+
+ 参数 +
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ 执行状态: +
+
+ 执行ID: +
+
+ 执行时间: +
+ +
+
+ +
+
Mask配置
+
+ +
+ 参数 +
+ + + +
+ +
+
+ +
+ +
+
+
+
+
+ 当前配置: +
+ + +
+
+ +
+
Mock配置
+
+ +
+ 参数 +
+ + + +
+ +
+
+ +
+ +
+
+
+
+
+ 当前配置: +
+ + +
+
+ +
+
权限管理
+
+
+
+
+
+
+ 当前DO权限 +
+
+
    +
+
+
+
+
+
+
+
状态管理
+
+
+
+
+ +
+
+ +
+
+ 选择镜像文件: + +
+ +
+ +
+
+ +
+
+
+
+
+
+ 结果: +
+ +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+
各类平台操作百分比
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
各类DO操作百分比
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
每日平台使用统计
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
每日DO操作统计
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
节点日志详情
+
+
+ 时间范围(单位:日) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
DO日志详情
+
+
+ 时间范围(单位:日) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
账本日志审计
+
+
+
+ +
+
+ 账本: +
+ +
+ Hash: +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
账本日志详情
+
+
+ 条数范围(单位:条) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
节点配置
+
+
+
+
+ 节点名称 +
+ +
+ +
+
+
+
+
+
+ 路由设置 +
+ +
+ +
+
+
+ +
+
+
+ PeerID +
+ +
+
+
+
+
+ YJS路径 +
+ +
+ +
+
+
+
+
+
+ MasterAddr +
+ +
+ +
+
+
+
+
+
+ 加入网络 +
+ +
+ +
+
+
+
+
+
+ 账本节点 +
+ +
+ +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/index_gate.html b/index_gate.html new file mode 100644 index 0000000..ee36cb5 --- /dev/null +++ b/index_gate.html @@ -0,0 +1,1333 @@ + + + + + 数瑞数联网网关Portal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+
+
+
+
用户情况
+ +
+
+ Loading... +
+
+
+
+
+
+
+
+
用户活跃统计
+ +
+
+
+ Loading... +
+
+
+ +
+
+
+
+ + +
+
+
+
+
授权用户管理
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
未授权用户管理
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+ +
+ +
+
+ +
+
+
+
+
+
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ + + + + + +
+ + +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ + +
+
+
+
+
+
+ 返回结果显示 +

+ +
+
+
+
+ + +
+ +
+
+
+ + +
+ + +
+
+ +
+
+
+
+
DO实例状态
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
各类DO实例调用次数
+
+
+
+ Loading... +
+
+
+
+
+
+
+ +
+
+
+
+
DO实例列表
+
+
+ Loading... +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ Loading... +
+
+
+ +
+
+
+
+
+
+
+
实例详情
+
+
+
+ +
+ +
+ + + + + +
+
+
+
实例调用
+
+
+ +
+
+ 参数 +
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ 执行状态: +
+
+ 执行ID: +
+
+ 执行时间: +
+ +
+
+ +
+
Mask配置
+
+ +
+ 参数 +
+ + + +
+ +
+
+ +
+ +
+
+
+
+
+ 当前配置: +
+ + +
+
+ +
+
Mock配置
+
+ +
+ 参数 +
+ + + +
+ +
+
+ +
+ +
+
+
+
+
+ 当前配置: +
+ + +
+
+ +
+
权限管理
+
+
+
+
+
+
+ 当前DO权限 +
+
+
    +
+
+
+
+
+
+
+
状态管理
+
+
+
+
+ +
+
+ +
+
+ 选择镜像文件: + +
+ +
+ +
+
+ +
+
+
+
+
+
+ 结果: +
+ +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+
各类平台操作百分比
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
各类DO操作百分比
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
每日平台使用统计
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
每日DO操作统计
+
+
+ 时间 +
+ +
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
节点日志详情
+
+
+ 时间范围(单位:日) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
DO日志详情
+
+
+ 时间范围(单位:日) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+
+
+
+
账本日志审计
+
+
+
+ +
+
+ 账本: +
+ +
+ Hash: +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
账本日志详情
+
+
+ 条数范围(单位:条) +
+ +
+ +
+
+
+
+
+
+ Loading... +
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
节点配置
+
+
+
+
+ 节点名称 +
+ +
+ +
+
+
+
+
+
+ 路由设置 +
+ +
+ +
+
+
+ +
+
+
+ PeerID +
+ +
+
+
+
+
+ YJS路径 +
+ +
+ +
+
+
+
+
+
+ MasterAddr +
+ +
+ +
+
+
+
+
+
+ 加入网络 +
+ +
+ +
+
+
+
+
+
+ 账本节点 +
+ +
+ +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/index_gateway.html b/index_gateway.html new file mode 100644 index 0000000..7e89059 --- /dev/null +++ b/index_gateway.html @@ -0,0 +1,165 @@ + +
+ + + 北大数瑞数联网网关 + + + + + +
+ +
+
+ +
+
+   导航   +
+ +
+ +
+
+ 网关接入管理 +
+
+
+ 网关配置管理 +
+ +
+ + + +
+
+ Icons made by + monkik + from + www.flaticon.com +
+
+ + + \ No newline at end of file diff --git a/js/NodeContractInstances.js b/js/NodeContractInstances.js index b6436c1..91a5bd2 100644 --- a/js/NodeContractInstances.js +++ b/js/NodeContractInstances.js @@ -137,7 +137,7 @@ ${table[i].name} ` } html += tableTail; - html = "
合约实例列表
" + html; + html = "
DO实例列表
" + html; ciTabDiv.html(html); $("#ciTabDivTab").DataTable( diff --git a/js/NodePortal.js b/js/NodePortal.js index 6fbc214..f60f1e1 100644 --- a/js/NodePortal.js +++ b/js/NodePortal.js @@ -274,7 +274,7 @@ function getControlWsUrl(host) { } path += "SCExecutor"; if (isBaaS) { - path = path.replace("ide/", "") + path = "/SCIDE/SCExecutor" } return prefix + host + path; } @@ -316,8 +316,8 @@ function onNodeLogin(data) { console.log("onNodeLogin"); pubkeyDialogVue.myRole = data.data; global.myRole = data.data; - loadUserMan(); loadNodeConfig(); + loadUserMan(); } function apply() { diff --git a/js/OnlineIDE.js b/js/OnlineIDE.js index 732db97..a8486d0 100644 --- a/js/OnlineIDE.js +++ b/js/OnlineIDE.js @@ -127,15 +127,7 @@ function getControlWsUrl(host) { if (document.location.href.startsWith("https")) { prefix = "wss://"; } - let path = document.location.pathname.lastIndexOf("/"); - path = document.location.pathname.substr(0, path + 1); - if (path.indexOf("SCIDE") < 0) { - path += "SCIDE/"; - } - path += "SCExecutor"; - if (isBaaS) { - path = path.replace("ide/", "") - } + path = "/SCIDE/SCExecutor"; return prefix + host + path; } diff --git a/js/cm.js b/js/cm.js index 20c2f1a..d1c3a42 100644 --- a/js/cm.js +++ b/js/cm.js @@ -75,9 +75,7 @@ var getControlWsUrl = function (host) { var prefix = "ws://"; if (document.location.href.startsWith("https")) prefix = "wss://"; - var path = document.location.pathname.lastIndexOf("/"); - path = document.location.pathname.substr(0, path + 1); - path += "SCExecutor"; + var path = "/SCIDE/SCExecutor"; return prefix + host + path; }; var initWSocket = function () { diff --git a/js/nodeCenter.js b/js/nodeCenter.js index edb5802..fb7d23e 100644 --- a/js/nodeCenter.js +++ b/js/nodeCenter.js @@ -176,8 +176,6 @@ var getControlWsUrl = function(host) { var prefix = "ws://"; if (document.location.href.startsWith("https")) prefix = "wss://"; - var path = document.location.pathname.lastIndexOf("/"); - path = document.location.pathname.substr(0, path + 1); - path += "SCExecutor"; + var path = "/SCIDE/SCExecutor"; return prefix + host + path; }; \ No newline at end of file