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

Author: eeg1412

README.md

@@ -45,31 +45,7 @@ by 广树 [维基萌](https://www.wikimoe.com/)
 3. 在[releases](https://github.com/eeg1412/wikimoeCardByNodeJS/releases)下载最新的版本。
 4. 除非特殊说明，请不要覆盖【server/config】下的文件以及【server/bin/nodejs.wikimoe.com-chain.pem】和【server/bin/nodejs.wikimoe.com-key.pem】两个文件。
 5. 如果遇到无法启动的情况请尝试删除【node_modules】文件夹重新执行【使用方法】中的2-3步。
-
-注意：v1.2.1~v2.2.1 的猜卡有一个无法兑换的BUG，请及时更新至最新版本！
-
-### v1.2.1更新至v2.0.0的方法
-
-1. 更新前请务必备份原先的文件和数据库！！！！
-2. 在[releases](https://github.com/eeg1412/wikimoeCardByNodeJS/releases)下载更新包。
-3. 解压更新包覆盖项目文件。
-4. 如果当前路径不在服务端则`cd server`切换至服务端。
-5. `npm install`更新依赖。
-6. `npm run update1to2`对1.x版本的数据库更新。
-7. 将原先填入default.js的默认服务器配置重新写入新的server\config\default.js里。
-8. 关闭窗口，执行`npm start`启动服务器。
-9. 浏览器进入/cardinstall，对网站进行配置。
-
-注意：必须是v1.2.1版本才能使用上面的升级方法！如果低于v1.2.1的话请先更新至该版本！
-
-### 修复卡牌2055的名称问题
-
- 0. 本手顺仅针对2.3.1版本之前，默认卡牌编号2055信息有误的处理，如果直接是2.3.1版本的话无需作此处理。
- 1. 更新前请务必备份原先的文件和数据库！！！！
- 2. 确保当前版本是2.3.1。
- 3. 如果当前路径不在服务端则`cd server`切换至服务端。
- 4. `npm install`更新依赖。
- 5. `npm run fixcard2055`对卡牌2055进行更改。
+6. 特殊更新步骤会在版本更新说明中说明，请仔细阅读版本更新说明。
 
 ### 使用方法
 

server/api/admin/ban.js

@@ -2,68 +2,74 @@ var chalk = require('chalk');
 var utils = require('../../utils/utils');
 var userData = require('../../utils/database/user');
 var adminUtils = require('../../utils/admin/adminUtils');
-module.exports = async function(req, res, next){
+const logModel = require('../../models/log');
+module.exports = async function (req, res, next) {
     let IP = utils.getUserIp(req);
     let token = req.body.token;
     let _id = req.body.id;
     let type = req.body.type;
     console.info(
-        chalk.green('开始封禁或者解封用户,IP为：'+IP)
+        chalk.green('开始封禁或者解封用户,IP为：' + IP)
     )
-    if(!token){
+    if (!token) {
         res.send({
-            code:402,
-            msg:'验证已失效'
+            code: 402,
+            msg: '验证已失效'
         });
         console.info(
-            chalk.yellow('token为空,IP为：'+IP)
+            chalk.yellow('token为空,IP为：' + IP)
         )
         return false;
     }
-    let result = await adminUtils.checkAdmin(token,IP);
-    if(!result){
+    let result = await adminUtils.checkAdmin(token, IP);
+    if (!result) {
         res.send({
-            code:402,
-            msg:'账户信息已失效，请重新登录！'
+            code: 402,
+            msg: '账户信息已失效，请重新登录！'
         });
         console.info(
-            chalk.yellow('token解析失败,IP为：'+IP)
+            chalk.yellow('token解析失败,IP为：' + IP)
         )
         return false;
     }
     let banType = 0;
-    if(type=='ban'){
+    if (type == 'ban') {
         banType = 1;
     }
-    let filters = {_id:_id};
+    let filters = { _id: _id };
     let parmas = {
-        ban:banType,
-        token:''
+        ban: banType,
+        token: ''
     };
-    userData.updataUser(filters,parmas).catch ((err)=>{
+    userData.updataUser(filters, parmas).catch((err) => {
         res.send({
-            code:0,
-            msg:'内部错误，更新失败！'
+            code: 0,
+            msg: '内部错误，更新失败！'
         });
         console.error(
             chalk.red('数据库更新错误！')
         );
         throw err;
     })
     let text = '解封成功！';
-    if(type=='ban'){
-        text = '封号成功！'
+    if (type == 'ban') {
+        text = '封号成功！';
+        const playerData = await userData.findUser(filters);
+        if (playerData) {
+            const playerMD5 = playerData.md5;
+            const logUpdate = await logModel.updateMany({ md5: playerMD5 }, { show: false });
+        }
     }
     let logObj = {
-        text:'管理员'+result.account+'对id：'+_id+text,
-        ip:IP
+        text: '管理员' + result.account + '对id：' + _id + text,
+        ip: IP
     }
     adminUtils.adminWriteLog(logObj);
     console.info(
-        chalk.green(text+'操作IP：'+IP)
+        chalk.green(text + '操作IP：' + IP)
     );
     res.send({
-        code:1,
-        msg:text
+        code: 1,
+        msg: text
     });
 }

server/api/battle.js

@@ -803,6 +803,7 @@ module.exports = async function (req, res, next) {
     if (AiP > seeAiP) {//50%概率遇见AI
         if (advanced) {//如果是进阶匹配
             let emScore = {
+                ban: 0,
                 score: { $gte: myScore + 500 },
                 email: { $ne: email },
                 battleHitStamp: { $lte: hitTime },
@@ -814,6 +815,7 @@ module.exports = async function (req, res, next) {
             let emMinScore = myScore - 500 < 0 ? 0 : myScore - 500;
             let emMaxScore = myScore + 500;
             let emScore = {
+                ban: 0,
                 score: { $gte: emMinScore, $lte: emMaxScore },
                 email: { $ne: email },
                 battleHitStamp: { $lte: hitTime },

server/api/searchBattleLogs.js

@@ -2,68 +2,68 @@ var utils = require('../utils/utils');
 var chalk = require('chalk');
 var battleLogsData = require('../utils/database/battleLogs');
 
-module.exports = async function(req, res, next){
+module.exports = async function (req, res, next) {
     let IP = utils.getUserIp(req);
     let token = req.body.token;
-    let page = isNaN(Math.round(req.body.page))?1:Math.round(req.body.page);
+    let page = isNaN(Math.round(req.body.page)) ? 1 : Math.round(req.body.page);
     console.info(
-        chalk.green('开始查询战战斗信息,IP为：'+IP)
+        chalk.green('开始查询战战斗信息,IP为：' + IP)
     )
     //解析token
-    if(!token){
+    if (!token) {
         console.info(
-            chalk.yellow(IP+'参数有误！')
+            chalk.yellow(IP + '参数有误！')
         )
         res.send({
-            code:403,
-            msg:'token为空！'
+            code: 403,
+            msg: 'token为空！'
         });
         return false;
     }
-    let result = await utils.tokenCheckAndEmail(token).catch ((err)=>{
+    let result = await utils.tokenCheckAndEmail(token).catch((err) => {
         throw err;
     });
-    if(!result){
+    if (!result) {
         res.send({
-            code:403,
-            msg:'账户信息已失效，请重新登录！'
+            code: 403,
+            msg: '账户信息已失效，请重新登录！'
         });
         console.info(
-            chalk.yellow('查询结果无该用户,IP为：'+IP)
+            chalk.yellow('查询结果无该用户,IP为：' + IP)
         );
         return false;
     }
     let email = result.email;
-    let time = Math.round(new Date().getTime()/1000);
+    // let time = Math.round(new Date().getTime() / 1000);
     console.info(
-        chalk.green(IP+'的邮箱解析结果为'+email)
+        chalk.green(IP + '的邮箱解析结果为' + email)
     )
     let parmas = {
-        time:{$gte:time-2592000},
+        // time: { $gte: time - 2592000 },
         $or: [
-           {aEmail: email}, {dEmail:email}
+            { aEmail: email }, { dEmail: email }
         ]
-     };
-    let battleLogs = await battleLogsData.findBattleLogs(8,'time data -_id',page,parmas).catch((err)=>{
+    };
+    let battleLogs = await battleLogsData.findBattleLogs(8, 'time data -_id', page, parmas).catch((err) => {
         res.send({
-            code:0,
-            msg:'内部错误请联系管理员！'
+            code: 0,
+            msg: '内部错误请联系管理员！'
         });
         console.error(
             chalk.red('数据库查询错误！')
         );
         throw err;
     });
-    let delParmas = {
-        time:{$lt:time-604800},
-    }
+    // let delParmas = {
+    //     time: { $lt: time - 604800 },
+    // }
     // 删除一周前的数据
-    await battleLogsData.deletBattleLogs(delParmas).catch ((err)=>{
-        throw err;
-    });
+    // await battleLogsData.deletBattleLogs(delParmas).catch ((err)=>{
+    //     throw err;
+    // });
     res.send({
-        code:1,
-        data:battleLogs[0],
-        total:battleLogs[1],
+        code: 1,
+        data: battleLogs[0],
+        total: battleLogs[1],
     });
 }

server/api/searchCard.js

@@ -2,42 +2,42 @@ var utils = require('../utils/utils');
 var cardData = require('../utils/database/cardData');
 var userData = require('../utils/database/user');
 var chalk = require('chalk');
-module.exports = async function(req, res, next){
+module.exports = async function (req, res, next) {
     console.info(
-        chalk.green('查询'+req.body.md5+'的卡牌。')
+        chalk.green('查询' + req.body.md5 + '的卡牌。')
     );
     let userMD5 = req.body.md5;
     let packageId = req.body.packageId || 0;
-    if(!utils.md5Check(userMD5)){
+    if (!utils.md5Check(userMD5)) {
         res.send({
-            code:0,
-            msg:'参数有误！'
+            code: 0,
+            msg: '参数有误！'
         });
         return false;
     }
-    let params = { md5: userMD5 };
-    let result = await userData.findUser(params).catch ((err)=>{
+    let params = { md5: userMD5, ban: 0 };
+    let result = await userData.findUser(params).catch((err) => {
         res.send({
-            code:0,
-            msg:'内部错误请联系管理员！'
+            code: 0,
+            msg: '内部错误请联系管理员！'
         });
         console.error(
             chalk.red('数据库查询错误！')
         );
         throw err;
     })
-    if(result){
+    if (result) {
         let myCard = result.card || {};
         let card = myCard[packageId];
-        if(card){
+        if (card) {
             let haveCardId = Object.keys(card).map(Number);
             let params = {
-                cardId:{$in:haveCardId}
+                cardId: { $in: haveCardId }
             }
-            let myCardData = await cardData.findCardDataMany(params,'-__v -_id').catch ((err)=>{
+            let myCardData = await cardData.findCardDataMany(params, '-__v -_id').catch((err) => {
                 res.send({
-                    code:0,
-                    msg:'内部错误请联系管理员！'
+                    code: 0,
+                    msg: '内部错误请联系管理员！'
                 });
                 console.error(
                     chalk.red('数据库查询错误！')
@@ -48,19 +48,19 @@ module.exports = async function(req, res, next){
         }
         card = card || [];
         res.send({
-            code:1,
-            card:card,
-            cardCount:myCard[packageId] || {},
-            md5:result.md5,
-            nickName:result.nickName,
-            score:result.score,
-            level:result.level,
-            cardIndexCount:result.cardIndexCount
+            code: 1,
+            card: card,
+            cardCount: myCard[packageId] || {},
+            md5: result.md5,
+            nickName: result.nickName,
+            score: result.score,
+            level: result.level,
+            cardIndexCount: result.cardIndexCount
         });
-    }else{
+    } else {
         res.send({
-            code:0,
-            msg:'无该用户信息！'
+            code: 0,
+            msg: '无该用户信息！'
         });
     }
 }

server/api/searchLog.js

@@ -1,17 +1,17 @@
 var logModel = require('../models/log');
-module.exports = async function(req, res, next){
+module.exports = async function (req, res, next) {
     let pageSize = 5;
-    let page = isNaN(Math.round(req.body.page))?1:Math.round(req.body.page);
-    let query = logModel.find({},"type time nickName md5 data -_id").sort({'_id':-1});
+    let page = isNaN(Math.round(req.body.page)) ? 1 : Math.round(req.body.page);
+    let query = logModel.find({ show: true }, "type time nickName md5 data -_id").sort({ '_id': -1 });
     let total = await query.countDocuments();
     let data = await query
         .find()
-        .skip(5*(page-1))
+        .skip(5 * (page - 1))
         .limit(pageSize);
     res.send({
-        code:1,
-        total:total,
-        data:data,
-        msg:'ok！'
+        code: 1,
+        total: total,
+        data: data,
+        msg: 'ok！'
     });
 }

server/models/battleLogs.js

@@ -4,10 +4,10 @@ var Schema = mongoose.Schema;
 var SchemaTypes = mongoose.Schema.Types;
 // Schema
 var battlelogs = new Schema({
-  aEmail:String,
-  dEmail:String,
-  time:{type: SchemaTypes.Long, default: 0},
-  data:{}
-});
+  aEmail: String,
+  dEmail: String,
+  time: { type: SchemaTypes.Long, default: 0 },
+  data: {}
+}, { capped: 15728640 });
 
 module.exports = mongoose.model('battlelogs', battlelogs);

server/models/log.js

@@ -10,7 +10,8 @@ var log = new Schema({
   type: { type: String, default: '' },
   time: { type: SchemaTypes.Long, default: 0 },
   data: {},
+  show: { type: Boolean, default: true },
   ip: String
-}, { capped: { size: 5242880, max: 1000 } });
+}, { capped: 15728640 });
 
 module.exports = mongoose.model('log', log);