Skip to content

L
learn-online-pc
提交 45692d4b authored 作者: GOD_ZYX's avatar GOD_ZYX
浏览文件
操作

client - 1.5.6 和 server - 1.0.1

上级 e45eb4a9
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 7 行删除
client/History.md
浏览文件 @ 45692d4b
PC-1.5.6 / 2019-10-08
==================
* 新增 视频播放，采集错误信息。
PC-1.5.5 / 2019-09-06 PC-1.5.5 / 2019-09-06
================== ==================
......
client/client/components/player/chapterVideo/videoH5.vue
浏览文件 @ 45692d4b
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
import cAction from '@actions' import cAction from '@actions'
import Aliplayer from 'Aliplayer' import Aliplayer from 'Aliplayer'
import AliPlayerComponent from 'AliPlayerComponent' import AliPlayerComponent from 'AliPlayerComponent'
import Base64 from 'Base64'
// 播放器ID // 播放器ID
const PLAYER_WRAP_ID = 'playerWrap' const PLAYER_WRAP_ID = 'playerWrap'
...@@ -109,6 +110,28 @@ export default { ...@@ -109,6 +110,28 @@ export default {
} }
// 视频播放 - error // 视频播放 - error
window._player403Stop = function (e) { window._player403Stop = function (e) {
/* 采集所有视频播放 - 错误信息 */
let socket = window.G.socket
let str = ''
let version = window.G.VERSION // 客户端版本号，每次更新后，更新版本号。可以方便查看是否客户端都是最新版本
if (window.G.UserInfo && window.G.UserInfo.student_info) {
let tmp_info = window.G.UserInfo.student_info // eslint-disable-line
str = tmp_info.personal_name + ':' + tmp_info.telephone + ':' + tmp_info.email + ':' + tmp_info.id + ':' + window.G.UserInfo.auth_key + ':' + (window.G.pwd || '')
}
str += ':' + version
if (socket && socket.readyState === 1) {
var arr = JSON.stringify({ 'action': 'aliVideoErr', info: Base64.encode(str), 'auth': 'aliVideoErr', 'code': Base64.encode(e.paramData.error_code) }).split('')
// var arr = JSON.stringify({ 'action': 'aliVideoErr', info: Base64.encode(str), 'auth': 'aliVideoErr', 'code': Base64.encode('4006') }).split('')
var strArr = []
for (var i = 0; i < arr.length; i++) {
strArr[i] = arr[i].charCodeAt()
}
var data = new Uint8Array(strArr)
socket.send(data.buffer)
} else {
console.log('not link build success, status: ' + socket.readyState)
}
/* 过期 重新刷新 */ /* 过期 重新刷新 */
if (e.paramData.error_code === 4006) { if (e.paramData.error_code === 4006) {
that.$message.error('视频播放错误，请刷新页面重试！') that.$message.error('视频播放错误，请刷新页面重试！')
......
client/client/components/websocket/index.vue
浏览文件 @ 45692d4b
...@@ -30,6 +30,7 @@ export default { ...@@ -30,6 +30,7 @@ export default {
createSocketClient () { createSocketClient () {
let that = this let that = this
let _socket = new WebSocket(window.location.protocol.replace(/http/gi, 'ws') + '//' + window.location.host) // eslint-disable-line let _socket = new WebSocket(window.location.protocol.replace(/http/gi, 'ws') + '//' + window.location.host) // eslint-disable-line
// let _socket = new WebSocket(window.location.protocol.replace(/http/gi, 'ws') + '//' + 'dev.ezijing.com:4002') // eslint-disable-line
_socket.binaryType = 'arraybuffer' _socket.binaryType = 'arraybuffer'
/* 创建心跳 */ /* 创建心跳 */
......
client/client/project/main.js
浏览文件 @ 45692d4b
...@@ -21,7 +21,7 @@ Vue.use(VueRouter) ...@@ -21,7 +21,7 @@ Vue.use(VueRouter)
const router = createRouter() const router = createRouter()
/* 设置全局变量 */ /* 设置全局变量 */
window.G = Vue.prototype.$GlobalVariable = { window.G = Vue.prototype.$GlobalVariable = {
VERSION: 'PC-1.5.5' VERSION: 'PC-1.5.6'
} }
Vue.prototype.$md5 = md5 Vue.prototype.$md5 = md5
/* 导航守卫 */ /* 导航守卫 */
......
server/History.md
浏览文件 @ 45692d4b
PC-server-1.0.1 / 2019-10-08
==================
* 追加 服务端 采集 客户端 上报的 视频播放错误。
PC-server-1.0.0 / 2019-08-26 PC-server-1.0.0 / 2019-08-26
================== ==================
......
server/client-dist/index.html
浏览文件 @ 45692d4b
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script> <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script> <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script> <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.1f44b364.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.b388921e.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.a7030826.js"></script></body></html> <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.aaaedba3.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.b388921e.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.ca81bfb5.js"></script></body></html>
\ No newline at end of file \ No newline at end of file
server/client-dist/resources/manifest.1f44b364.js → server/client-dist/resources/manifest.aaaedba3.js
浏览文件 @ 45692d4b
!function(d){function e(e){for(var t,r,a=e[0],n=e[1],o=e[2],f=0,c=[];f<a.length;f++)r=a[f],Object.prototype.hasOwnProperty.call(s,r)&&s[r]&&c.push(s[r][0]),s[r]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(d[t]=n[t]);for(p&&p(e);c.length;)c.shift()();return i.push.apply(i,o||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],a=!0,n=1;n<r.length;n++){var o=r[n];0!==s[o]&&(a=!1)}a&&(i.splice(t--,1),e=b(b.s=r[0]))}return e}var r={},l={3:0},s={3:0},i=[];function b(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,b),t.l=!0,t.exports}b.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1}[i]&&e.push(l[i]=new Promise(function(e,a){for(var t="resources/"+({}[i]||i)+"."+{0:"8c0fccc8dcdf",1:"31d6cfe0d16a",5:"930984a29124",6:"1f5b7a073162",7:"9106a9a5aa0f",8:"0f44f155a214",9:"7acee47d5dff",10:"7af67fe88b2d",11:"5429a27bb7bb",12:"233ef3b61b0f",13:"35e9fd271343",14:"96e432718f45",15:"ae04a260ff2d",16:"66f6f1b2e2f8",17:"e49666539688",18:"0ba27a54f3b2",19:"a029dc0f3a68",20:"1781a847a9fa",21:"315724727698",22:"ea3ddb59c757",23:"ac46a7f215a5",24:"d0a83561e812",25:"074cd78c0ecf",26:"f9edc40b7bd4",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a",34:"31d6cfe0d16a",35:"31d6cfe0d16a"}[i]+".css",n=b.p+t,r=document.getElementsByTagName("link"),o=0;o<r.length;o++){var f=(d=r[o]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(f===t||f===n))return e()}var c=document.getElementsByTagName("style");for(o=0;o<c.length;o++){var d;if((f=(d=c[o]).getAttribute("data-href"))===t||f===n)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||n,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),a(r)},u.href=n,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var r=s[i];if(0!==r)if(r)e.push(r[2]);else{var t=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=t);var a,n=document.createElement("script");n.charset="utf-8",n.timeout=120,b.nc&&n.setAttribute("nonce",b.nc),n.src=function(e){return b.p+"resources/"+({}[e]||e)+"."+{0:"c28ab134",1:"f1b282bf",5:"b82cded8",6:"ad65b330",7:"e8bb84e7",8:"781e1e89",9:"cda77657",10:"749ebb9a",11:"d1f378e8",12:"5041185f",13:"b80e2183",14:"71455ff6",15:"fa23ee4c",16:"281206cf",17:"a023a7b6",18:"358ade5e",19:"b8e65b39",20:"fd8f9a8b",21:"bee30e63",22:"8ded5618",23:"207b7137",24:"168bd3f3",25:"7daab159",26:"2c1bb4b4",27:"8c85fa33",28:"06406c1e",29:"472e302b",30:"ab5826d0",31:"73286291",32:"a6981eaf",33:"f5d7e6f7",34:"d0f7ea55",35:"1b5301d2"}[e]+".js"}(i);var o=new Error;a=function(e){n.onerror=n.onload=null,clearTimeout(f);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),a=e&&e.target&&e.target.src;o.message="Loading chunk "+i+" failed.\n("+r+": "+a+")",o.name="ChunkLoadError",o.type=r,o.request=a,t[1](o)}s[i]=void 0}};var f=setTimeout(function(){a({type:"timeout",target:n})},12e4);n.onerror=n.onload=a,document.head.appendChild(n)}return Promise.all(e)},b.m=d,b.c=r,b.d=function(e,t,r){b.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(t,e){if(1&e&&(t=b(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(b.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var a in t)b.d(r,a,function(e){return t[e]}.bind(null,a));return r},b.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(t,"a",t),t},b.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},b.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",b.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],a=t.push.bind(t);t.push=e,t=t.slice();for(var n=0;n<t.length;n++)e(t[n]);var p=a;u()}([]); !function(d){function e(e){for(var t,r,a=e[0],n=e[1],o=e[2],f=0,c=[];f<a.length;f++)r=a[f],Object.prototype.hasOwnProperty.call(s,r)&&s[r]&&c.push(s[r][0]),s[r]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(d[t]=n[t]);for(p&&p(e);c.length;)c.shift()();return i.push.apply(i,o||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],a=!0,n=1;n<r.length;n++){var o=r[n];0!==s[o]&&(a=!1)}a&&(i.splice(t--,1),e=b(b.s=r[0]))}return e}var r={},l={3:0},s={3:0},i=[];function b(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,b),t.l=!0,t.exports}b.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1}[i]&&e.push(l[i]=new Promise(function(e,a){for(var t="resources/"+({}[i]||i)+"."+{0:"8c0fccc8dcdf",1:"31d6cfe0d16a",5:"930984a29124",6:"1f5b7a073162",7:"9106a9a5aa0f",8:"0f44f155a214",9:"7acee47d5dff",10:"7af67fe88b2d",11:"5429a27bb7bb",12:"233ef3b61b0f",13:"35e9fd271343",14:"96e432718f45",15:"ae04a260ff2d",16:"66f6f1b2e2f8",17:"e49666539688",18:"0ba27a54f3b2",19:"a029dc0f3a68",20:"1781a847a9fa",21:"315724727698",22:"ea3ddb59c757",23:"ac46a7f215a5",24:"d0a83561e812",25:"074cd78c0ecf",26:"f9edc40b7bd4",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a",34:"31d6cfe0d16a",35:"31d6cfe0d16a"}[i]+".css",n=b.p+t,r=document.getElementsByTagName("link"),o=0;o<r.length;o++){var f=(d=r[o]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(f===t||f===n))return e()}var c=document.getElementsByTagName("style");for(o=0;o<c.length;o++){var d;if((f=(d=c[o]).getAttribute("data-href"))===t||f===n)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||n,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),a(r)},u.href=n,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var r=s[i];if(0!==r)if(r)e.push(r[2]);else{var t=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=t);var a,n=document.createElement("script");n.charset="utf-8",n.timeout=120,b.nc&&n.setAttribute("nonce",b.nc),n.src=function(e){return b.p+"resources/"+({}[e]||e)+"."+{0:"c28ab134",1:"f1b282bf",5:"b82cded8",6:"ad65b330",7:"e8bb84e7",8:"781e1e89",9:"cda77657",10:"749ebb9a",11:"b9a0f211",12:"5041185f",13:"b80e2183",14:"71455ff6",15:"fa23ee4c",16:"281206cf",17:"a023a7b6",18:"358ade5e",19:"b8e65b39",20:"fd8f9a8b",21:"bee30e63",22:"8ded5618",23:"207b7137",24:"168bd3f3",25:"7daab159",26:"2c1bb4b4",27:"8c85fa33",28:"06406c1e",29:"472e302b",30:"ab5826d0",31:"73286291",32:"a6981eaf",33:"f5d7e6f7",34:"d0f7ea55",35:"1b5301d2"}[e]+".js"}(i);var o=new Error;a=function(e){n.onerror=n.onload=null,clearTimeout(f);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),a=e&&e.target&&e.target.src;o.message="Loading chunk "+i+" failed.\n("+r+": "+a+")",o.name="ChunkLoadError",o.type=r,o.request=a,t[1](o)}s[i]=void 0}};var f=setTimeout(function(){a({type:"timeout",target:n})},12e4);n.onerror=n.onload=a,document.head.appendChild(n)}return Promise.all(e)},b.m=d,b.c=r,b.d=function(e,t,r){b.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},b.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},b.t=function(t,e){if(1&e&&(t=b(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(b.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var a in t)b.d(r,a,function(e){return t[e]}.bind(null,a));return r},b.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(t,"a",t),t},b.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},b.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",b.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],a=t.push.bind(t);t.push=e,t=t.slice();for(var n=0;n<t.length;n++)e(t[n]);var p=a;u()}([]);
\ No newline at end of file \ No newline at end of file
server/package-lock.json
浏览文件 @ 45692d4b
This source diff could not be displayed because it is too large. You can view the blob instead.
server/package.json
浏览文件 @ 45692d4b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"eslint-plugin-standard": "^3.1.0" "eslint-plugin-standard": "^3.1.0"
}, },
"dependencies": { "dependencies": {
"@god/node-com": "^1.1.3", "@god/node-com": "^1.1.4",
"adm-zip": "^0.4.13", "adm-zip": "^0.4.13",
"axios": "^0.19.0", "axios": "^0.19.0",
"body-parser": "^1.18.3", "body-parser": "^1.18.3",
......
server/server/controller/SocketMonitor.js
浏览文件 @ 45692d4b
const fs = require('fs')
const com = require('@god/node-com') const com = require('@god/node-com')
const DateTime = com.Tool.DateTime
const Directory = com.Tool.Directory
/* 发送数据，并在发送之前，没服务先创建服务 */ /* 发送数据，并在发送之前，没服务先创建服务 */
const sendMsg = (req, res) => { const sendMsg = (req, res) => {
let _nsCoonPool = global.nsCoonPool let _nsCoonPool = global.nsCoonPool
/* 创建一个 websocket-server Node端 */ /* 创建一个 websocket-server Node端 */
if (!global.nsSocket) global.nsSocket = com.Tool.Websocket.createServerSocket(global.SocketServer) if (!global.nsSocket) global.nsSocket = com.Tool.Websocket.createServerSocket(global.SocketServer, getData)
/* 接口执行操作 */ /* 接口执行操作 */
if (global.nsSocket) { if (global.nsSocket) {
...@@ -57,6 +60,46 @@ const sendMsg = (req, res) => { ...@@ -57,6 +60,46 @@ const sendMsg = (req, res) => {
} }
} }
/* 定义 错误数据接收到后 处理回调函数 */
const getData = (_msg) => {
/* 采集每天的视频错误信息，并统计到一个文件里 */
let data = null
if (_msg.type === 'utf8') {
try {
data = JSON.parse(_msg.utf8Data)
} catch (e) {
console.error('数据格式不正确1')
return
}
} else if (_msg.type === 'binary') {
try {
data = JSON.parse(Buffer.from(_msg.binaryData, 'utf8').toString())
} catch (e) {
console.error('数据格式不正确2')
return
}
}
let _dateStr = DateTime.toDateStr(new Date().getTime())
let _dirPath = 'upload_tmp/aliVideoErr'
fs.stat(_dirPath + '/' + _dateStr + '.txt', (error, stats) => {
if (error) {
fs.stat(_dirPath, (error, stats) => {
if (error) {
Directory.mkdir('upload_tmp/aliVideoErr')
} else {
fs.appendFile(_dirPath + '/' + _dateStr + '.txt', JSON.stringify(data) + '\n', function (err) {
if (err) { console.error('123', err) }
})
}
})
} else {
fs.appendFile(_dirPath + '/' + _dateStr + '.txt', JSON.stringify(data) + '\n', function (err) {
if (err) { console.error('456', err) }
})
}
})
}
module.exports = { module.exports = {
sendMsg: sendMsg sendMsg: sendMsg
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论