diff options
| author |   jin xin <j00101220@huawei.com> | 2016-10-21 08:41:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2016-10-21 08:41:38 +0000 |
| commit | 61a456234d16a62467452a6349e6899e83fdb3c7 (patch) | |
| tree | 3913316d2469ea6bc03a7951e4182b8fdd20dd82 | |
| parent | 87a8df023e4cb1fc820cc6a57030822e3fef1b84 (diff) | |
| parent | aded7d9dba4ff4b43badeae9cda0783b10301ab7 (diff) | |
Merge "MODIFIED CONFG FILES NFVO-32" into sun
| -rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json | 2 | ||||
| -rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json index 20ce9a54..93714d49 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json @@ -1,5 +1,5 @@ { "url": "http://127.0.0.1", "port": "8080", - "context_name":"resmgr" + "context_name":"/resmgr" }
\ No newline at end of file diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js index df55a1d0..bf8f829c 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js @@ -22,7 +22,7 @@ function getUrl(){ async:false, dataType:"json", success:function(jsonData) { - url = jsonData.url + ":" + jsonData.port +"/"+jsonData.context_name; + url = jsonData.url + ":" + jsonData.port +jsonData.context_name; console.log("url = " + url); } }); |