Merge pull request #913 from pxgo/master

调整、添加、修复

dataModels/AccountBehaviorModel.js

@@ -121,7 +121,7 @@ schema.statics.ensurePermission = async (options) => {
   const {
     type, username, ip, mobile, nationCode, email
   } = options;
-  const redLock = require("../nkcModules/redLock");
+  const { redLock } = require("../nkcModules/redLock");
   const lock = await redLock.lock(`accountBehaviorPermission:${type}`, 6000);
   try{
     const {

dataModels/ActivationCodeModel.js

@@ -0,0 +1,44 @@
+const mongoose = require('../settings/database');
+const collectionName = 'activationCodes';
+const schema = new mongoose.Schema(
+  {
+    _id: String,
+    toc: {
+      type: Date,
+      default: Date.now,
+      index: 1,
+    },
+    used: {
+      type: Boolean,
+      default: false,
+      index: 1,
+    },
+    // 激活码的来源，考试系统, 管理员等
+    source: {
+      type: String,
+      required: true,
+    },
+    // 来源ID
+    sid: {
+      type: String,
+      required: true,
+    },
+    uid: {
+      type: String,
+      default: '',
+    },
+    timeOfUse: {
+      type: Date,
+      default: null,
+    },
+    expiration: {
+      type: Date,
+      required: true,
+    },
+  },
+  {
+    collection: collectionName,
+  },
+);
+
+module.exports = mongoose.model(collectionName, schema);

dataModels/ArticleModel.js

@@ -1,6 +1,7 @@
 const mongoose = require('../settings/database');
 const moment = require('moment');
 const tools = require('../nkcModules/tools');
+const { subscribeSources } = require('../settings/subscribe');
 
 const articleSources = {
   column: 'column',
@@ -374,7 +375,7 @@ schema.statics.changeKey = async (content) => {
  * */
 schema.statics.getNewId = async () => {
   const ArticleModel = mongoose.model('articles');
-  const redLock = require('../nkcModules/redLock');
+  const { redLock } = require('../nkcModules/redLock');
   const getRedisKeys = require('../nkcModules/getRedisKeys');
   const { getRandomString } = require('../nkcModules/apiFunction');
   const key = getRedisKeys('newArticleId');
@@ -1599,9 +1600,9 @@ schema.methods.addArticleHits = async function () {
 schema.statics.getCollectedCountByAid = async function (aid) {
   const SubscribeModel = mongoose.model('subscribes');
   return await SubscribeModel.countDocuments({
-    type: 'article',
+    source: subscribeSources.collectionArticle,
     cancel: false,
-    tid: aid,
+    sid: aid,
   });
 };
 

dataModels/ColumnModel.js

@@ -2,6 +2,7 @@ const mongoose = require('../settings/database');
 const { ThrowServerInternalError } = require('../nkcModules/error');
 const moment = require('moment');
 const Schema = mongoose.Schema;
+const {subscribeSources} = require('../settings/subscribe')
 const schema = new Schema(
   {
     _id: Number,
@@ -541,8 +542,8 @@ schema.methods.getSubscriptionTrends = async function (minTime, maxTime) {
   let sub = await SubscribeModel.aggregate([
     {
       $match: {
-        type: 'column',
-        columnId: columnId,
+        source: subscribeSources.column,
+        sid: columnId,
         toc: {
           $gte: _minTime,
           $lt: _maxTime,
@@ -566,8 +567,8 @@ schema.methods.getSubscriptionTrends = async function (minTime, maxTime) {
   let unsub = await SubscribeModel.aggregate([
     {
       $match: {
-        type: 'column',
-        columnId: columnId,
+        source: subscribeSources.column,
+        sid: columnId,
         tlm: {
           $gte: _minTime,
           $lt: _maxTime,

dataModels/CommentModel.js

@@ -1507,7 +1507,7 @@ schema.methods.updateCommentsVote = async function () {
  * */
 schema.statics.getNewId = async () => {
   const CommentModel = mongoose.model('comments');
-  const redLock = require('../nkcModules/redLock');
+  const { redLock } = require('../nkcModules/redLock');
   const getRedisKeys = require('../nkcModules/getRedisKeys');
   const { getRandomString } = require('../nkcModules/apiFunction');
   const key = getRedisKeys('newArticleId');