From cd83ef88f783205bc17d06b249fa62f9425957c6 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 11 Aug 2017 09:54:33 +0800
Subject: [PATCH] 测试-不要频繁增加连接数

---
 method.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/method.js b/method.js
index a1a4cd1..07aa228 100644
--- a/method.js
+++ b/method.js
@@ -190,7 +190,9 @@
             x3: x9,  //������
             x4: x11, //������
             x5: x10, //������
-            x6: x14  //������������
+            x6: x14,  //������������
+
+            mcu: mcu
         },
         options: _config.options,
         time: current.valueOf()
@@ -199,7 +201,7 @@
 
     var rank = 0;
     if(s > 0) {
-        rank = this.random(1000, 99999);//this.random(1000, 99999999);
+        rank = this.random(100200, 102000);//this.random(1000, 99999999);
         db.collection("device_ranks").insertOne({
             mac: mac,
             rank: rank,
@@ -352,12 +354,15 @@
 };
 
 module.exports.initConfigs = function(db) {
+    var _address = config.ALARM_DEFAULTS.address;
+    var _location = config.ALARM_DEFAULTS.location;
+    var _options = config.ALARM_DEFAULTS.options;
     db.collection("devices").find().toArray(function(err, docs) {
         docs.forEach(function(doc) {
             var mac = doc.mac;
-            var address = doc.address || config.ALARM_DEFAULTS.address;
-            var location = doc.location || config.ALARM_DEFAULTS.location;
-            var options = doc.options || config.ALARM_DEFAULTS.options;
+            var address = doc.address || _address;
+            var location = doc.location || _location;
+            var options = doc.options || _options;
             var notice = doc.notice;
             var config = {
                 mac: mac,

--
Gitblit v1.8.0