李勇

1.处理伴音和媒体文件外部接口上传之后返回地址不正确导致404的问题

@@ -63,7 +63,7 @@ export default class MessageEntrance extends Emiter { @@ -63,7 +63,7 @@ export default class MessageEntrance extends Emiter {
63 super(); 63 super();
64 this.lastClassActiveTime=0;//最后一次课堂激活的时间戳 64 this.lastClassActiveTime=0;//最后一次课堂激活的时间戳
65 //sdk 信息 65 //sdk 信息
66 - GlobalConfig.sdkVersion = "v2.23.0.20171030"; 66 + GlobalConfig.sdkVersion = "v2.24.2.20171030";
67 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); 67 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
68 console.log("sdkVersion:" + GlobalConfig.sdkVersion); 68 console.log("sdkVersion:" + GlobalConfig.sdkVersion);
69 //设置 69 //设置
@@ -2729,6 +2729,11 @@ export default class MessageEntrance extends Emiter { @@ -2729,6 +2729,11 @@ export default class MessageEntrance extends Emiter {
2729 "seek": 0, 2729 "seek": 0,
2730 "duration": parseInt(value.duration) || 0 2730 "duration": parseInt(value.duration) || 0
2731 }; 2731 };
  2732 + //外部接口上传的伴音文件返回的地址有的不正确,需要特殊处理,检测是否有DocSharing目录
  2733 + if(paramInfo.url&&paramInfo.url.indexOf("/DocSharing/")<0){
  2734 + loger.log("替换MP3路径地址",paramInfo.url);
  2735 + paramInfo.url=paramInfo.url.replace("/data/","/DocSharing/data/");
  2736 + }
2732 this._sendMusicSharedUpload(paramInfo); 2737 this._sendMusicSharedUpload(paramInfo);
2733 } 2738 }
2734 } 2739 }
@@ -2755,6 +2760,11 @@ export default class MessageEntrance extends Emiter { @@ -2755,6 +2760,11 @@ export default class MessageEntrance extends Emiter {
2755 "seek": 0, 2760 "seek": 0,
2756 "duration": parseInt(value.duration) || 0 2761 "duration": parseInt(value.duration) || 0
2757 }; 2762 };
  2763 + //外部接口上传的伴音文件返回的地址有的不正确,需要特殊处理,检测是否有DocSharing目录
  2764 + if(paramInfo.url&&paramInfo.url.indexOf("/DocSharing/")<0){
  2765 + loger.log("替换MP4路径地址",paramInfo.url);
  2766 + paramInfo.url=paramInfo.url.replace("/data/","/DocSharing/data/");
  2767 + }
2758 this._sendMediaSharedUpload(paramInfo); 2768 this._sendMediaSharedUpload(paramInfo);
2759 } 2769 }
2760 } 2770 }
@@ -545,6 +545,10 @@ class MediaSharedApe extends Ape { @@ -545,6 +545,10 @@ class MediaSharedApe extends Ape {
545 try { 545 try {
546 let pduDataModel = pdu['RCMediaSharedSendDataModelPdu'].decode(itemData); 546 let pduDataModel = pdu['RCMediaSharedSendDataModelPdu'].decode(itemData);
547 // loger.log("媒体文件===>unPackPdu"); 547 // loger.log("媒体文件===>unPackPdu");
  548 + if(pduDataModel.url&&pduDataModel.url.indexOf("/DocSharing/")<0){
  549 + loger.log("替换文件路径地址",pduDataModel.url);
  550 + pduDataModel.url=pduDataModel.url.replace("/data/","/DocSharing/data/");
  551 + }
548 return pduDataModel; 552 return pduDataModel;
549 } catch (err) { 553 } catch (err) {
550 loger.log("媒体文件===>unPackPdu->Pdu解析错误->itemIdx=" + itemIdx + "->err:" + err.message); 554 loger.log("媒体文件===>unPackPdu->Pdu解析错误->itemIdx=" + itemIdx + "->err:" + err.message);
@@ -523,7 +523,7 @@ class MusicSharedApe extends Ape { @@ -523,7 +523,7 @@ class MusicSharedApe extends Ape {
523 pduDataModel.from = GlobalConfig.nodeId; 523 pduDataModel.from = GlobalConfig.nodeId;
524 pduDataModel.fileType = _param.fileType || ""; 524 pduDataModel.fileType = _param.fileType || "";
525 pduDataModel.creatUserId = _param.creatUserId || "0"; 525 pduDataModel.creatUserId = _param.creatUserId || "0";
526 - pduDataModel.url = _param.url || ""; //这个地址没用到,数据太长占用资源 暂停使用//"http://101.200.150.192/DocSharing/data/h5test/20170206-171100025/7e9c4178cac1133e0dd9d5b583439122.jpg"; 526 + pduDataModel.url = _param.url || "";
527 pduDataModel.status = _param.status || 0; 527 pduDataModel.status = _param.status || 0;
528 pduDataModel.fileId = _param.fileId || ""; //伴音文件在服务器数据库中的唯一id,必须有 528 pduDataModel.fileId = _param.fileId || ""; //伴音文件在服务器数据库中的唯一id,必须有
529 pduDataModel.fileName = _param.fileName || "music_" + _itemIdx; //伴音文件的名字 529 pduDataModel.fileName = _param.fileName || "music_" + _itemIdx; //伴音文件的名字
@@ -541,6 +541,10 @@ class MusicSharedApe extends Ape { @@ -541,6 +541,10 @@ class MusicSharedApe extends Ape {
541 try { 541 try {
542 let pduDataModel = pdu['RCMusicSharedSendDataModelPdu'].decode(itemData); 542 let pduDataModel = pdu['RCMusicSharedSendDataModelPdu'].decode(itemData);
543 // loger.log("伴音文件===>unPackPdu"); 543 // loger.log("伴音文件===>unPackPdu");
  544 + if(pduDataModel.url&&pduDataModel.url.indexOf("/DocSharing/")<0){
  545 + loger.log("替换文件路径地址",pduDataModel.url);
  546 + pduDataModel.url=pduDataModel.url.replace("/data/","/DocSharing/data/");
  547 + }
544 return pduDataModel; 548 return pduDataModel;
545 } catch (err) { 549 } catch (err) {
546 loger.log("伴音文件===>unPackPdu->Pdu解析错误->itemIdx=" + itemIdx + "->err:" + err.message); 550 loger.log("伴音文件===>unPackPdu->Pdu解析错误->itemIdx=" + itemIdx + "->err:" + err.message);