Skip to content

Z
zanhuangyingji
Commit e95b55ca authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

修改配置

parent 20ace91e
Hide whitespace changes
Inline Side-by-side
Showing with 5927 additions and 4474 deletions
ioc_frontweb/js/common/cometd/cometd.js
View file @ e95b55ca
This source diff could not be displayed because it is too large. You can view the blob instead.
ioc_frontweb/js/common/scooper.video.js
View file @ e95b55ca
This source diff could not be displayed because it is too large. You can view the blob instead.
ioc_frontweb/js/utils.js
View file @ e95b55ca
// var videoPlatUrl = 'http://27.128.189.131:8089';
// var apiUrl = 'http://47.104.61.232:8902';
// var pushUrl = 'http://47.104.61.232:8905';
// var wsUrl = 'ws://47.104.61.232:8905/iocdata/websocket';
// var iocUrl = 'http://47.104.61.232:8902/ioc';
// var iocWsUrl = 'ws://47.104.61.232:8902/ioc/websocket';
var videoPlatUrl = 'http://27.128.189.131:8089';
var apiUrl = 'http://36.148.23.59:8901';
var pushUrl = 'http://36.148.23.59:8901';
var wsUrl = 'ws://36.148.23.59:8901/iocdata/websocket';
var iocUrl = 'http://36.148.23.59:8901/ioc';
var iocWsUrl = 'ws://36.148.23.59:8901/ioc/websocket';
var videoPlatUrl = 'http://'+window.location.hostname+":18902";
// var apiUrl = 'http://localhost:8902'; var apiUrl = 'http://'+window.location.hostname+":8902";
// var pushUrl = 'http://localhost:8905'; var pushUrl = 'http://'+window.location.hostname+":8905";
// var wsUrl = 'ws://localhost:8905/iocdata/websocket'; var wsUrl = 'ws://'+window.location.hostname+':8905/iocdata/websocket';
// var iocUrl = 'http://localhost:8902/ioc'; var iocUrl = 'http://'+window.location.hostname+':8902/ioc';
// var iocWsUrl = 'ws://localhost:8902/ioc/websocket'; var iocWsUrl = 'ws://'+window.location.hostname+':8902/ioc/websocket';
//var videoPlatUrl = 'http://27.128.189.131:8089';
// var apiUrl = 'http://36.148.23.59:8901';
// var pushUrl = 'http://36.148.23.59:8901';
// var wsUrl = 'ws://36.148.23.59:8901/iocdata/websocket';
// var iocUrl = 'http://36.148.23.59:8901/ioc';
// var iocWsUrl = 'ws://36.148.23.59:8901/ioc/websocket';
...@@ -61,8 +54,8 @@ var apis = { ...@@ -61,8 +54,8 @@ var apis = {
getEnterpriseCameraById: apiUrl + '/ioc/frontApi/getEnterpriseCameraById', getEnterpriseCameraById: apiUrl + '/ioc/frontApi/getEnterpriseCameraById',
getEleDeviceInfoListByUserId: apiUrl + '/ioc/frontApi/getEleDeviceInfoListByUserId', getEleDeviceInfoListByUserId: apiUrl + '/ioc/frontApi/getEleDeviceInfoListByUserId',
mapSearch: apiUrl + '/ioc/frontApi/mapSearch', mapSearch: apiUrl + '/ioc/frontApi/mapSearch',
getPreviewURLs: apiUrl + '/ioc/artemis/getPreviewURLs', getPreviewURLs: apiUrl + '/ioc/Artemis/getPreviewURLs',
videoControlling: apiUrl + '/ioc/artemis/videoControlling', videoControlling: apiUrl + '/ioc/Artemis/videoControlling',
scooper: { scooper: {
cometd: videoPlatUrl + '/scooper-msg-queue/cometd', cometd: videoPlatUrl + '/scooper-msg-queue/cometd',
queryGisTrails: videoPlatUrl + '/scooper-app-msg/gis/queryGisTrails', queryGisTrails: videoPlatUrl + '/scooper-app-msg/gis/queryGisTrails',
...@@ -467,11 +460,11 @@ function initVideo(ele) { ...@@ -467,11 +460,11 @@ function initVideo(ele) {
user: conf['video.username'], user: conf['video.username'],
passwd: conf['video.password'], passwd: conf['video.password'],
// ip: conf['video.ip'], // ip: conf['video.ip'],
ip: '27.128.189.131', ip: window.location.hostname,
//videoServer port //videoServer port
port: conf['video.port'], port: conf['video.port'],
// janusUrl: conf['video.janus.url'] // janusUrl: conf['video.janus.url']
janusUrl: 'ws://27.128.189.131:8188', janusUrl: 'ws://'+window.location.hostname+':8188',
}, },
//码流类型，默认0 //码流类型，默认0
streamType: conf['video.stream'], streamType: conf['video.stream'],
...@@ -1173,7 +1166,7 @@ function login() { ...@@ -1173,7 +1166,7 @@ function login() {
var opts = { var opts = {
url: apis.scooper.loginTo, url: apis.scooper.loginTo,
type: 'post', type: 'post',
data: { accUsername: 'psxyj2', accPassword: sha256_digest('abc123') }, data: { accUsername: 'admin', accPassword: sha256_digest('scooper') },
contentType: 'application/x-www-form-urlencoded', contentType: 'application/x-www-form-urlencoded',
success: function (res) { success: function (res) {
if (res.code == 0) { if (res.code == 0) {
...@@ -1434,9 +1427,13 @@ function getVideoUrl(cameraIndexCode,optionId) { ...@@ -1434,9 +1427,13 @@ function getVideoUrl(cameraIndexCode,optionId) {
borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00', borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00',
} }
}); });
var dataUrl = JSON.parse(data);
player.JS_Play(res.data.url, var url =dataUrl.data.url
{playURL: res.data.url, mode:"0" }, "0").then(() => { console.log('realplay success') }, if(window.location.hostname!="192.168.3.3"){
url = url.replace("192.168.3.7","27.128.187.38");
}
player.JS_Play(url,
{playURL: url, mode:"0" }, "0").then(() => { console.log('realplay success') },
e => { console.error(e) } e => { console.error(e) }
) )
......
ioc_frontweb/video/base-config.js
View file @ e95b55ca
//只需配置ip和端口即可 //只需配置ip和端口即可
var videoPlatIp = '27.128.189.131'; var videoPlatIp = '27.128.189.131';
var videoPlatPort = '8089'; var videoPlatPort = '8089';
var videoPlatUrl = 'http://' + videoPlatIp + ':' + videoPlatPort; //var videoPlatUrl = 'http://' + videoPlatIp + ':' + videoPlatPort;
var videoPlatUrl = window.location.hostname+":18902";
document.write('<link rel="stylesheet" media="screen" href="'+videoPlatUrl+'/scooper-video/css/new/scooper.video.css"/>'); document.write('<link rel="stylesheet" media="screen" href="'+videoPlatUrl+'/scooper-video/css/new/scooper.video.css"/>');
// document.write('<link rel="stylesheet" media="screen" href="./main.css"/>'); // document.write('<link rel="stylesheet" media="screen" href="./main.css"/>');
......
ioc_frontweb/video/main.js
View file @ e95b55ca
...@@ -46,12 +46,11 @@ function handleGetQuery(name) { ...@@ -46,12 +46,11 @@ function handleGetQuery(name) {
passwd: conf['video.password'], passwd: conf['video.password'],
//videoServer ip //videoServer ip
// ip: conf['video.ip'], // ip: conf['video.ip'],
ip: '27.128.189.131', ip: window.location.hostname,
//videoServer port //videoServer port
port: conf['video.port'], port: conf['video.port'],
//janus地址
// janusUrl: conf['video.janus.url'] // janusUrl: conf['video.janus.url']
janusUrl: 'ws://27.128.189.131:8188', janusUrl: 'ws://'+window.location.hostname+':8188',
}, },
//码流类型，默认0 //码流类型，默认0
streamType: conf['video.stream'], streamType: conf['video.stream'],
......
ioc_frontweb/video/main_map.js
View file @ e95b55ca
...@@ -96,12 +96,11 @@ var video_ids = { ...@@ -96,12 +96,11 @@ var video_ids = {
passwd: conf['video.password'], passwd: conf['video.password'],
//videoServer ip //videoServer ip
// ip: conf['video.ip'], // ip: conf['video.ip'],
ip: '27.128.189.131', ip: window.location.hostname,
//videoServer port //videoServer port
port: conf['video.port'], port: conf['video.port'],
//janus地址 // janusUrl: conf['video.janus.url']
// janusUrl: conf['video.janus.url'] janusUrl: 'ws://'+window.location.hostname+':8188',
janusUrl: 'ws://27.128.189.131:8188'
}, },
//码流类型，默认0 //码流类型，默认0
streamType: conf['video.stream'], streamType: conf['video.stream'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment