From a8c5e5bce0c58f2780ed0f6daac1b62b6a1fc1e1 Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Tue, 31 Jan 2017 15:49:02 +0800
Subject: [PATCH] 环境数接口程序后台代码修复，同时去除调试代码等
---
method.js | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/method.js b/method.js
index 3cad431..a1a4cd1 100644
--- a/method.js
+++ b/method.js
@@ -173,27 +173,9 @@
var _config = global.configs[mac];
if(_config == null) {
- _config = {
- mac: mac,
- address: "���������������������������������",
- location: {
- lat:31.430616,
- lng:120.988327
- },
- notice: {
- tel: "15950198162",
- email: "it01@moral.org.cn",
- open_id: "o-RTuwvMHWotyirPHLmdSB_dKoQU"
- },
- options: {
- 1: [1000, 2000, 3000],
- 2: [1000, 2000, 3000],
- 3: [1000, 2000, 3000],
- 4: [1000, 2000, 3000],
- 5: [1000, 2000, 3000]
- }
- };
- configs[mac] = _config;
+ _config = config.ALARM_DEFAULTS;
+ _config.mac = mac;
+ global.configs[mac] = _config;
}
var current = moment();
@@ -373,10 +355,10 @@
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 || config.ALARM_DEFAULTS.address;
+ var location = doc.location || config.ALARM_DEFAULTS.location;
+ var options = doc.options || config.ALARM_DEFAULTS.options;
var notice = doc.notice;
- var options = doc.options;
var config = {
mac: mac,
address: address,
@@ -388,7 +370,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