Merge branch 'dev' of https://github.com/eeg1412/wikimoeCardByNodeJS into master

Author: eeg1412

server/api/searchCard.js

@@ -55,7 +55,11 @@ module.exports = async function (req, res, next) {
             nickName: result.nickName,
             score: result.score,
             level: result.level,
-            cardIndexCount: result.cardIndexCount
+            cardIndexCount: result.cardIndexCount,
+            deminingStarCount: result.deminingStarCount,
+            UCC: result.UCC,
+            guessCardCount: result.guessCardCount,
+            questCount: result.questCount,
         });
     } else {
         res.send({

server/api/wssystem.js

@@ -0,0 +1,74 @@
+var utils = require('../utils/utils')
+const _ = require('lodash')
+const validator = require('validator')
+exports.login = async function (token, socket) {
+    let IP = ''
+    if (socket.handshake.headers['x-forwarded-for'] != null) {
+        IP = socket.handshake.headers['x-forwarded-for']
+    } else {
+        IP = socket.handshake.address
+    }
+    IP = IP.match(/\d+.\d+.\d+.\d+/)
+    IP = IP ? IP.join('.') : 'No IP'
+    let backData = {
+        status: false,
+        IP: IP,
+    }
+    if (token) {
+        // 验证用户信息
+        let result = await utils.tokenCheckAndEmail(token).catch((err) => {
+            throw err
+        })
+        // 如果验证成功
+        if (result) {
+            backData = {
+                status: true,
+                userInfo: result,
+                IP: IP,
+            }
+        }
+    }
+    return backData
+}
+exports.searchUser = async (socket, data) => {
+    // 查找在线用户
+    let page = 1
+    if (data) {
+        page = data.page || 1
+    }
+    const userDataCount = _.groupBy(global.onlinePlayer, (value) => {
+        return value.email
+    })
+    if (!validator.isInt(page + '', { min: 1 })) {
+        page = 1
+    }
+    const pagination = function (pageSize, currentPage, arr) {
+        var skipNum = (currentPage - 1) * pageSize
+        var newArr =
+            skipNum + pageSize >= arr.length
+                ? arr.slice(skipNum, arr.length)
+                : arr.slice(skipNum, skipNum + pageSize)
+        return newArr
+    }
+    const pushBy = function (group) {
+        var list = []
+        group.forEach((item) => {
+            list.push(item.device)
+        })
+        return list
+    }
+    let pageUser = _.map(userDataCount, (item) => {
+        return {
+            md5: item[0].md5,
+            nickName: item[0].nickName,
+            loginTime: item[0].loginTime,
+            deviceList: pushBy(item),
+        }
+    })
+    pageUser = pagination(5, page, pageUser)
+    socket.emit('searchUserRes', {
+        code: 900,
+        pageUser: pageUser,
+        userTotal: Object.keys(userDataCount).length,
+    })
+}

server/app.js

@@ -4,6 +4,7 @@ global.demining = {
     onlinePlayer: [],
     loaing: true
 };
+global.onlinePlayer = []
 //全局矿场信息
 global.MAX_INT32 = 2147483647;
 global.MAX_INTJS = 9007199254740991;

server/bin/www

@@ -8,6 +8,7 @@ let debug = require('debug')('wikimoecard:server')
 let http = require('http')
 let https = require('https')
 let demining = require('../api/demining')
+let wssystem = require('../api/wssystem')
 let fs = require('fs')
 const chalk = require('chalk')
 const cheerio = require('cheerio')
@@ -127,9 +128,16 @@ io.of('/wsdemining').on('connection', async (socket) => {
     socket.on('demining', (data) => {
       // console.log('deminging');
       // console.log(data);
-
-      // 处理挖矿逻辑
-      demining.mine(socket, data)
+      if (!_.isObject(data)) {
+        socket.emit('demining', {
+          code: 1,
+          msg: '内部错误请联系管理员！',
+          time: data.time,
+        })
+      } else {
+        // 处理挖矿逻辑
+        demining.mine(socket, data)
+      }
     })
     socket.on('disconnect', function () {
       console.info(chalk.green(userEmail + '下线！'))
@@ -153,11 +161,72 @@ io.of('/wsdemining').on('connection', async (socket) => {
     socket.disconnect()
   }
 })
+// 系统websocket
+io.of('/wssystem').on('connection', async (socket) => {
+  let token = socket.handshake.query.dt
+  // console.log("dt",token);
+  const userData = await wssystem.login(token, socket).catch((err) => {
+    throw err
+  })
+  if (userData.status) {
+    // 用户验证通过
+
+    const socketId = socket.id
+    const userEmail = userData.userInfo.email
+
+    const UA = socket.request.headers['user-agent']
+    const newPlayer = {
+      email: userEmail,
+      md5: userData.userInfo.md5,
+      nickName: userData.userInfo.nickName,
+      loginTime: Math.round(new Date().getTime() / 1000),
+      device: UA,
+      socketId: socketId,
+    }
+    global.onlinePlayer.push(newPlayer)
+    console.info(chalk.green(userEmail + '登陆抽卡系统!IP为:' + userData.IP))
+    // 发送在线人数
+    const newUserDataCount = _.groupBy(
+      global.onlinePlayer,
+      (value) => {
+        return value.email
+      }
+    )
+    io.of('/wssystem').emit('userCount', {
+      userCount: Object.keys(newUserDataCount).length,
+    })
+    socket.on('searchUser', (data) => {
+      wssystem.searchUser(socket, data)
+    })
+    socket.on('checkTime', () => {
+      socket.emit('getTime', new Date().getTime())
+    })
+    socket.on('disconnect', function () {
+      console.info(chalk.green(userEmail + '下线抽卡系统！'))
+      global.onlinePlayer = global.onlinePlayer.filter(
+        (item) => item.socketId !== socketId
+      )
+      const newUserDataCount = _.groupBy(
+        global.onlinePlayer,
+        (value) => {
+          return value.email
+        }
+      )
+      io.of('/wssystem').emit('userCount', {
+        userCount: Object.keys(newUserDataCount).length,
+      })
+    })
+  } else {
+    // 用户验证失败
+    console.info(chalk.yellow(userData.IP + '登陆抽卡服务器失败,Token有误!'))
+    socket.disconnect()
+  }
+})
 /**
  * Normalize a port into a number, string, or false.
  */
 
-function normalizePort(val) {
+function normalizePort (val) {
   var port = parseInt(val, 10)
 
   if (isNaN(port)) {
@@ -177,7 +246,7 @@ function normalizePort(val) {
  * Event listener for HTTP server "error" event.
  */
 
-function onError(error) {
+function onError (error) {
   if (error.syscall !== 'listen') {
     throw error
   }
@@ -203,7 +272,7 @@ function onError(error) {
  * Event listener for HTTP server "listening" event.
  */
 
-function onListening() {
+function onListening () {
   var addr = server.address()
   var bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port
   debug('Listening on ' + bind)

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikimoecard",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "private": true,
   "scripts": {
     "start": "nodemon --delay 60 -e pem,key --watch bin ./bin/www",

server/public/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=zh><head><meta charset=UTF-8><title>抽卡系统加载中...</title><base href=/ ><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=/api/siteConfig.js></script><link rel=icon href=/favicon.ico type=image/x-icon><link href=/static/css/app.c9dd261.css rel=stylesheet></head><body><div id=app></div><div id=wm_index_footer></div><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.runtime.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-router.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/axios.min.js></script><script type=text/javascript src=/static/js/manifest.cd4cf30.js></script><script type=text/javascript src=/static/js/vendor.f0d038d.js></script><script type=text/javascript src=/static/js/app.f48df77.js></script></body></html>
+<!DOCTYPE html><html lang=zh><head><meta charset=UTF-8><title>抽卡系统加载中...</title><base href=/ ><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=/api/siteConfig.js></script><link rel=icon href=/favicon.ico type=image/x-icon><link href=/static/css/app.2ffafec.css rel=stylesheet></head><body><div id=app></div><div id=wm_index_footer></div><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.runtime.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-router.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/axios.min.js></script><script type=text/javascript src=/static/js/manifest.d9128e8.js></script><script type=text/javascript src=/static/js/vendor.548d0c0.js></script><script type=text/javascript src=/static/js/app.d49b7f8.js></script></body></html>