ucservice 1.0.3 → 1.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "统一通信服务",
   "main": "dist/ucservice.common.js",
   "style": "ucservice.css",

package/src/common-request.js

@@ -15,7 +15,7 @@ export const loadJson = function(url, param, backSuccfn, async, method, headers)
   async = (async == undefined? true:async);
   let ajaxContent = {
     'method': method,
-    'url': server + url,
+    'url':  url,
     'data': param,
     'async' : async
   }
@@ -31,16 +31,17 @@ export const loadJson = function(url, param, backSuccfn, async, method, headers)
 }
 
 /**
- * 
+ * @param {*} sip  //用户传过来的服务ip地址 http://{ip}:{port}
  * @param {*} meetcallfunc  会议通知处理
  * @param {*} callfunc   呼叫通知处理
  * @param {*} videocallfunc 视频通知处理
  * @param {*} connectcallfunc 通讯录通知处理
  */
-export const initCometd = function(meetcallfunc, callfunc, videocallfunc, connectcallfunc){ //初始
+export const initCometd = function(meetcallfunc, callfunc, videocallfunc, connectcallfunc, sip){ //初始
+  let server_ = sip || server;
   let _cometd = new cometd.CometD("xjInfoReport");
   _cometd.websocketEnabled = true;
-  let cometdUrl = server + cometd_server;
+  let cometdUrl = server_ + cometd_server;
   _cometd.init({
       url: cometdUrl,
       logLevel: "info"
@@ -105,13 +106,15 @@ function doSubscribe(_cometd, callback) {
 
 /**
  * 初始化视频获取视频对象
+ * @param {*} sip  //用户传过来的服务ip地址 http://{ip}:{port}
  * @param {*} token 
  * @param {*} videoArea //展示视频的容器模块
  * 使用该方法前提是videoArea等相关dom节点必须已加载完毕
  */
-export const initVideo = function(token, videoArea){ //读取视频服务配置初始化视频
+export const initVideo = function(token, videoArea, sip){ //读取视频服务配置初始化视频
+  let server_ = sip || server;
   return new Promise((resolve, reject) =>{
-    let url = server + '/scooper-video/conf/data';
+    let url = server_ + '/scooper-video/conf/data';
     var param = {};
     $.getJSON(url,param,function (conf) {
       // 初始化视频播放方式

package/src/config.js

@@ -9,7 +9,7 @@ import message from '@/net_url/message_url';  //短信
 import record from '@/net_url/record_url';  //录音录像
 import video from '@/net_url/video_net_url';  //视频
 
-export const server = 'http://10.249.4.152:8080';   //服务地址
+export const server = 'http://10.249.4.152:8080';   //内网服务地址
 export const cometd_server = '/scooper-msg-queue/cometd'; //
 
 export { account, aduio, aduio_video, dept_ry, dept, location, meet, message, record, video}