From 7922a931d41978a602068a9521fe0cff619fd0a8 Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Wed, 15 Feb 2017 09:52:31 +0800
Subject: [PATCH] 增加mcu温度到调试服务MQ中
---
method.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/method.js b/method.js
index 032d7ab..b954412 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()
@@ -352,13 +354,16 @@
};
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 || "";
- var location = doc.location || {};
+ var address = doc.address || _address;
+ var location = doc.location || _location;
+ var options = doc.options || _options;
var notice = doc.notice;
- var options = doc.options;
var config = {
mac: mac,
address: address,
@@ -370,7 +375,7 @@
var userID = doc.userID;
db.collection("users").find({"_id": userID}).limit(1).next(function(err, user){
if(user) {
- config[notice] = {
+ config["notice"] = {
tel: user.username,
email: user.email,
open_id: user.open_id
--
Gitblit v1.8.0