diff --git a/.env.development b/.env.development index 24a9a462..dd15e68b 100644 --- a/.env.development +++ b/.env.development @@ -14,10 +14,10 @@ VUE_APP_BOE_WEB_URL = 'https://u.boe.com' VUE_APP_BOE_MOBILE_URL = 'http://192.168.0.10:8082/mobile' # File路径的基础url -VUE_APP_FILE_BASE_URL = 'http://localhost:9090/cdn/upload' +VUE_APP_FILE_BASE_URL = 'http://localhost:8091/upload' # File路径的基础url的相对路径,加此项是为了不影响之前的路径配置 -VUE_APP_FILE_RELATIVE_PATH = 'http://localhost:9090/cdn/upload' +VUE_APP_FILE_RELATIVE_PATH = '/upload' # 登录地址 VUE_APP_LOGIN_URL='/pc/login' diff --git a/.env.preview b/.env.preview index 1bfad93f..c4f83763 100644 --- a/.env.preview +++ b/.env.preview @@ -14,7 +14,7 @@ VUE_APP_BOE_WEB_URL = 'https://u.boe.com/preview' VUE_APP_BOE_MOBILE_URL = 'http://u.boe.com' # File路径的基础url -VUE_APP_FILE_BASE_URL='http://u-pre.boe.com/upload' +VUE_APP_FILE_BASE_URL='http://u.boe.com/upload' # File路径的基础url的相对路径,加此项是为了不影响之前的路径配置 VUE_APP_FILE_RELATIVE_PATH = '/upload' @@ -23,4 +23,4 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload' VUE_APP_PUBLIC_PATH='/pc' # 登录地址 -VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/' +VUE_APP_LOGIN_URL='https://u.boe.com/web/' diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 05eb8607..0dbf43cc 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -459,7 +459,6 @@ export default { $this.$message.error('加载pdf课件文件失败'); } }); - //let url = this.fileBaseUrl + r.content; }else if(con.contentType ==52){ if(con.content.startsWith('\{')){ @@ -500,34 +499,19 @@ export default { createPlayUrl(fid,u){ let nowDate=new Date(); let ctime=parseInt(nowDate.getTime()/1000); - let beforeUrl=parseInt(nowDate.getTime()/1000)+u; + let beforeUrl=parseInt(nowDate.getTime()/1000)+'/'+fid; //console.log(beforeUrl,'beforeUrl'); - //let urlSign=encodeURIComponent(encrypt(beforeUrl)); + let urlSign=encodeURIComponent(encrypt(beforeUrl)); //console.log(urlSign,'urlSign'); cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存 - //this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign; - this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/course/resource?fid='+fid; - //this.blobUrl='http://127.0.0.1:9090/xboe/course/resource?fid='+fid; - //this.blobUrl=this.fileBaseUrl+u; + //以下判断是为了区分本地环境和服务器环境 + if(process.env.NODE_ENV == 'development'){ + this.blobUrl=process.env.VUE_APP_FILE_BASE_URL+u; + }else{ + this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/cware/resource?sign='+urlSign; + } //console.log(this.blobUrl,'this.blobUrl'); }, - createVideoBlob(url){ - let $this=this; - let xhr = new XMLHttpRequest; - xhr.open("GET",url,true); - xhr.responseType = 'blob'; - //xhr.onload:只有 4 状态会触发 - xhr.onreadystatechange = function() { - if (xhr.readyState==4 && xhr.status == 200) {//请求成功 - //获取blob对象 - let blob = xhr.response; - //获取blob对象地址,并把值赋给容器 - let urlObj = window.URL.createObjectURL(blob); - $this.blobUrl=urlObj; - } - }; - xhr.send(); - }, showQrimage(row){ let urlPre=window.location.protocol+'//'+window.location.host; // https://u.boe.com/mobile/pages/resource/microDetail?id=963456709515939840 diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index 9b5b3fbd..0d4e74b2 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -26,7 +26,7 @@